Merge branch 'master' of https://github.com/icalvete/puppet-puppet

Conflicts:
	manifests/dashboard/config.pp
	templates/puppet_dashboard.vhost.erb
	templates/puppet_master.conf.erb
Dashboard port has been parameterized
Merge branch 'master' of https://github.com/icalvete/puppet-puppet