Added functionality to state for salt cloud and exampel for EC2 and GCE
Added functionality to state for salt syndic deamon.
Merge pull request #40 from jacksoncage/salt-syndic

Added functionality to state for salt syndic daemon
Fix nested file,pillar _roots in minion and master templates

See #37 "Fixed file_roots config generation with several environment"
Merge pull request #1 from saltstack-formulas/master

Update from master
Fixed merge conflict and rearaged readme.
Merge pull request #41 from jacksoncage/salt-cloud

Added functionality to state for salt cloud and exampel for EC2 and GCE
Merge pull request #42 from westurner/fix-nested-_roots

Fix for nested [file|pillar]_roots in minion tmpl (seeAlso: #37)
Update README.rst
Added rest_cherrypy section
Merge pull request #43 from danielfrg/patch-1

Added rest_cherrypy section
#12 Moved master and minion config file to .d
Merge pull request #44 from jacksoncage/config-files

#12 Moved master and minion config file to .d folder
Add missing .conf to config files

Closes #45
Merge pull request #46 from johtso/issue-45

Add missing .conf to config files
Pillar example whitespace
Add FreeBSD to the package-map
Initial FreeBSD support
Avoid config key clashes

Fixes #48
Merge pull request #49 from johtso/issue-48

Avoid config key clashes