tweak the gulpfile
fixed the merge conflicts with master