update master branch to reflect gh-pages changes

Using a pull request, update master branch to be like gh-pages