.htaccess update

pull with master in hopes of getting the .htaccess update