Merge branch 'gh-pages'
cleared out a bunch of unnecessary stuff
draft final version
Merge branch 'master' into gh-pages