Merge CoffeeScript support from vinch/master