make coffeescript more idiomatic and start adding tests
Merge branch 'master' into rr/coffeescript
make more idiomatic
Merge branch 'rr/coffeescript'
CoffeeScript is 2-space indent