Updating coffeescript version
Merge branch 'gh-pages'
Adding a little exposition because I'm bored at work
Merge branch 'master' into gh-pages