Update gh-pages

I hope it's ok @mdo; I was too lazy to split the patches :)

Let me know if you need me to make any changes.