#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
Added salt-cloud support for Rackspace OpenStack servers.
Merge pull request #50 from andrew-vant/rsprov

Added salt-cloud support for Rackspace OpenStack servers.
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.
Merge pull request #51 from andrew-vant/salt.d

Added recursive management of minion.d and master.d.
Readme note about user-provided configuration templates.
Merge pull request #52 from andrew-vant/salt.d.doc

Readme note about user-provided configuration templates.
Merge remote-tracking branch 'origin/pr/47'

Conflicts:
	salt/master.sls
	salt/minion.sls
Added a Vagrant setup to instantly test the formula
Vagrant: increased wait to ensure the minion sent it's key to the master before Accepting all keys.
Added a basic description of Vagrant usage.
Merge pull request #53 from ZetaBit/vagrant

Vagrant