Grunt watch tweaks