Updating gh-pages from master

Title says it all: this PR brings all the recent changes to `master` over to `gh-pages`.