Merge remote-tracking branch 'greg-puppet/master' into greg-puppet
Conflicts: templates/puppet.conf.erb
Merge remote-tracking branch 'greg-puppet/master' into greg-puppet
Conflicts:
templates/puppet.conf.erb