Merge remote-tracking branch 'upstream/master' into 441_windows_support

diff --combined package.json
index 74ba3e00927324af7b6ce78c6be25926ee0a3261,2a043a8515382e90d7603f3f188b211e67899a9a..67eb824dc90f2770af7274e505db4352a0bcb8d7
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -38,18 -38,26 +38,26 @@@
      "browserify": "^13.1.0",
      "chai": "3.5.0",
      "docdash": "0.4.0",
-     "exorcist": "^0.4.0",
      "express": "4.13.4",
      "express-ws": "2.0.0-rc.1",
+     "fs-extra": "^1.0.0",
      "glob": "^7.0.5",
+     "gulp": "^3.9.1",
+     "gulp-cli": "^1.2.2",
+     "gulp-sourcemaps": "1.9.1",
+     "gulp-typescript": "^3.1.3",
      "jsdoc": "3.4.3",
+     "merge-stream": "^1.0.1",
      "mocha": "2.5.3",
 +    "node-pty": "^0.4.1",
      "nodemon": "1.10.2",
 -    "pty.js": "0.3.1",
      "sleep": "^3.0.1",
      "sorcery": "^0.10.0",
+     "tsify": "^3.0.0",
      "tslint": "^4.0.2",
-     "typescript": "^2.0.3"
+     "typescript": "^2.0.3",
+     "vinyl-buffer": "^1.0.0",
+     "vinyl-source-stream": "^1.1.0"
    },
    "scripts": {
      "prestart": "npm run build",
@@@ -58,7 -66,7 +66,7 @@@
      "lint": "tslint src/**/*.ts",
      "test": "mocha --recursive ./lib",
      "build:docs": "jsdoc -c jsdoc.json",
-     "build": "./bin/build",
+     "build": "gulp build",
      "prepublish": "npm run build"
    }
  }

diff --combined src/test/escape-sequences-test.js
index 7dcefd95b496d2e90b9e222c6d163101f5a1183a,e9183ccf255a8df0d9c80f94323669961639a37d..6c64b562ef22b91826d84eb613b753a11baafd0e
--- 1/src/test/escape-sequences-test.js
--- 2/src/test/escape-sequences-test.js
+++ b/src/test/escape-sequences-test.js
@@@ -1,6 -1,6 +1,6 @@@
  var glob = require('glob');
  var fs = require('fs');
 -var pty = require('pty.js');
 +var pty = require('node-pty');
  var sleep = require('sleep');
  var Terminal = require('../xterm');
  
@@@ -92,7 -92,11 +92,11 @@@ describe('xterm output comparison', fun
          var from_pty = pty_write_read(in_file);
          // uncomment this to get log from terminal
          //console.log = function(){};
-         xterm.write(from_pty);
+ 
+         // Perform a synchronous .write(data)
+         xterm.writeBuffer.push(from_pty);
+         xterm.innerWrite();
+ 
          var from_emulator = terminalToString(xterm);
          console.log = CONSOLE_LOG;
          var expected = fs.readFileSync(filename.split('.')[0] + '.text', 'utf8');