Fix for file delete
Update to puppet, changed apache config to use Dynamic Virtual Hosts with mod_vhost_alias
Fixed conflicts