added watch to gruntfile and tweaked.