Further fabfile updates and refactored apache.conf.templ