Use puppetlabs/apache 0.9.x
Merge branch 'modern_apache' into footballradar

Conflicts:
	manifests/params.pp