environments
Merge branch 'master' of github.com:sandwitch/puppet

Conflicts:
	environments/development/modules/test/manifests/init.pp