Remove old gh-pages file
Merge branch 'master' into gh-pages