update gulpfile
merged from master