Merge branch 'feature-nginx' of puppet-git:bastelfreak-puppetmodule into feature-nginx

Conflicts:
	manifests/master.pp
	manifests/params.pp
	manifests/passenger.pp
	manifests/unicorn.pp
	templates/puppetmaster

Author: Tim Meusel