Update gulpfile to use gulp-watch and gulp-concat