Real deal
Merge branch 'vhost-dir-rewrites' of github.com:blhughes/puppetlabs-apache into vhost-dir-rewrites

Conflicts:
	templates/vhost/_directories.erb