Merge branch 'gh-pages'
Remove dead CSS link
Merge branch 'master' into gh-pages