Update included H5BP .htaccess

- Add latest updates from H5BP

- Remove various parts that were previously commented out
Update 404 template based on H5BP
Merge remote-tracking branch 'upstream/master'
normalize logo font-weight