Get everything on the same page

Need to change over to gh-pages as default, but let's make sure master &amp; gh-pages are the same to start.