Fix up the vhost

Use the puppetlabs/apache 0.8 vhost features to more closely approximately what
was previously specified in the custom template.
Merge branch 'use_newer_apache' into movealong