Re-add rewrite rules

- Since currently running under a vhost, these need to be in place...
Merge branch 'hotfix/htaccess'