Improve grunt watch task