Merge in improved gulpfile