Updating local branch
Merge branch 'master' of https://github.com/hundredacres/puppet-puppet

Conflicts:
	templates/passenger/puppet-passenger.conf.erb