Merged & updated gulpfile