Merge branch 'gh-pages'
I dunno a bunch of stuff!
Merge branch 'master' into gh-pages