Make watch tasks more targeted, clean up Gruntfile