Don't overite gulpfile options with default options

Any custom options were being overwritten by the default options object. The default options and custom options now merge correctly