Merge gh-pages to master

The real deal this time