Bring all necessary files from gh-pages into master

There are a lot of superflous commits here, but the resulting file changes are correct. Rather than have to take everything apart (as there were numerous commits to gh-pages that needed to come over) I suggest we just take the hit and bring in the extra commits for now. There shouldn't be a need to ever have any more of them going forward.