Update .htaccess
Merge .htaccess with fix from kBasten