Update gh-pages to master

I FUCKED UP K?
My pull request merged into master, not gh-pages, so you could never actually use the shit that I added. Imagine no one using the stuff I do, it'd be a lonely world.