Improve watch service in gruntfile