Sync gh-pages content with master

gh-pages content and master should not be diverging in a repo of this type.