Thanks buddy :) That's a problem with adding new packages in all features, always some conflict to solve, and comas are difficult to spot when you try to solve conflicts quickly.

I'll investigate whether I can migrate that file to coffeescript, would help a lot.