Fixing up .htaccess.
Merge branch 'master' into charter