Add Grunt watch

See #1973