Merge branch 'master' into htaccess-enhancements
Added .html file extension

Added the .html file extension to the rewrite rules. It’s somewhat
silly that we rewrite .htm but not .html
Merge pull request #12 from karlding/htaccess-enhancements

Added ability to also rewrite .html extensions