Some gulpfile simplifications