Added folder sync sls and updated pillar example
Merge branch 'master' into folder-sync-config