Removing master branch and merging branches.

Simplifying the repo by having just a gh-pages branch. Updating
gh-pages to match latest commits on master.