JS and Coffeescript don't mix up. Use it intelligently.
Merge branch 'master' into marmite