Tweaked the Grunt commands and added watch

. #154