Merge gh-pages back into master

gotta keep things in synch.