Use Grunt watch
Fix DEBUG definitions