Conflicts:
	salt/master.sls
	salt/minion.sls

Readme note about user-provided configuration templates.

Added recursive management of minion.d and master.d.

This allows users to easily add configuration settings that the formula
doesn't yet provide, without having to modify the existing templates.

Added salt-cloud support for Rackspace OpenStack servers.

Avoid config key clashes

Fixes #48

Add missing .conf to config files

Closes #45

#12 Moved master and minion config file to .d folder

Added rest_cherrypy section

Fix for nested [file|pillar]_roots in minion tmpl (seeAlso: #37)

Added functionality to state for salt cloud and exampel for EC2 and GCE

Update from master

See #37 "Fixed file_roots config generation with several environment"

Added functionality to state for salt syndic daemon

Fixed typo in autoreject_file setting

Fixed an apparent typo in the autoreject_file setting (which was listed as autorejecte_file)

Fixed file_roots config generation with several environment

log_granular_levels pillar data looks at the wrong thing

Update formula docs URL

add Amazon os to package map

Actualized master and minion config files templates

Fixed formatting in readme.

Updated readme to match standards.

possibility to define Halite configuration for salt-master

sync with https://github.com/saltstack/salt/blob/v0.17.4/conf/master and minion

Added module_config section to minion template