merge updates to gulpfile