Merge pull request #2406 from almende/build-cleanup

removed merge-stream

gulpfile.js

@@ -8,7 +8,6 @@ var rename = require("gulp-rename");
 var webpack = require('webpack');
 var uglify = require('uglify-js');
 var rimraf = require('rimraf');
-var merge = require('merge-stream');
 var argv = require('yargs').argv;
 
 var ENTRY             = './index.js';

package.json

@@ -47,7 +47,6 @@
     "gulp-concat": "^2.6.0",
     "gulp-rename": "^1.2.2",
     "gulp-util": "^3.0.7",
-    "merge-stream": "^1.0.0",
     "mocha": "^3.1.2",
     "rimraf": "^2.5.2",
     "uglify-js": "^2.6.2",