Config files, shared and tied to environment
Error in puppet-auth.conf.erb
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/puppet-auth.conf.erb