update coffeescript to use new status url
fix merge conflict