recompiling with CoffeeScript 1.6.3
Merge branch 'master' into gh-pages