Merging changes from gh-pages

Merging changes from gh-pages.
Probably should do this in the other direction next time...