Add puppetlabs/apache module (v1.1.1) and deps
Add previously un-puppeted puppetmaster vhost
Remove puppetmaster vhost conf file
Simplify puppetmaster config, add vhost