figured out simpler way of setting $ alias in Gruntfile.coffee
resolved merging conflicts