Merge GH Page changes into master

but don't delete the gh-pages branch!