update master to correspond with gh-pages