Mopping up branches
This is really weird and I don't think I'm doing this right.
Merge branch 'master' into gh-pages