Allow using dynamic environments without a git repository
Fixes #2064 - manage puppetmaster if passenger is not used

Conflicts:

	manifests/server.pp
Refresh Apache vhost from Puppet upstream, tighten SSL protocols

Conflicts:

	templates/server/puppet-vhost.conf.erb
Add 'listen' support for puppet agent

Conflicts:

	manifests/init.pp
	templates/puppet.conf.erb
Actually use the puppet::server::port if it is configured
Added a helper function to manage subpaths in modulepaths.
Allow using additional subfolders beneath your modules folder.