Updating master to include gh-pages branch