Moving gh-pages to master

Let's get everything on the master branch