Merge branch 'issue686' into 1.6.x
update to coffee-script 1.6.1
Merge branch 'coffeeUpdate' into 2.0.x