added watch and removed use of gulp-group-aggregate