Grunt watch

Changes for #6 and #7