Switching to our branch of puppetlabs/apache