Master branch sync

I've been working on the gh-pages branch this entire time…whoops.  This
commit is just to add all of the files where they should be.