merged twbs / deploy

*moved .htaccess directives to httpd.conf