Merge pull request #141 from bbinet/file-contents_pillar

Add contents_pillar support for files managed by pillar