rebase on newest michaelficarra/coffeescript-project (sans bundling)