Fixed bug with coffeescript erroring because I did not finish transposing
pulled changes