Further gulpfile improvments