check out both master and gh-pages
rebase against origin/master
ah, should have used ${} to avoid ambiguity