Add `grunt watch` incremental build; Simplify Gruntfile