using coffee-script's macro-build branch

I created this branch in my own fork because the "macro" branch wasn't built.
Merge remote-tracking branch 'origin/master' into gh-pages