Add puppet labs apache module
Use puppet apache module, remove custom module