Various fixes/improvements to gulpfile