Merge gh-pages content into master

I'm changing my workflow a bit so I can write drafts that don't immediately get published. This requires me to first merge the gh-pages and master branches.