Merge branch 'hotfix/ey-hook'
Merge branch 'hotfix/ey-hook'
Re-add rewrite rules

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