Initial commit
Add .htaccess files back into directories where they're necessary
Fixing up small merge conflicts with master