NaNoBloWriMo post
Merge branch 'master' into gh-pages

Continuing to need to merge in the master branch since I've totally screwed up how to use `gh-pages`.