Added some docs on the pillars-from-files option
Merge branch 'master' of github.com:simonmcc/kitchen-salt