Clean up for coffeescript convention
Merged conflicts.
Merged conflicts.
Merge branch 'kumabotz-coffeescript-convention'
Merge branch 'master' of https://github.com/codecombat/codecombat