No more declaring listen statement in vhost
Merge branch 'master' of https://github.com/Freeaqingme/puppet-puppet into HEAD

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