Swapping out a few things.
Merge branch 'gh-pages' of github.com:mikeal/jsfest into gh-pages