Merge branch 'gh-pages'
remove other stuff git broke
Merge branch 'master' into working-copy