Merge branch 'master' into script_improvements

package.json

@@ -1,48 +1,16 @@
 {
   "name": "xterm",
   "description": "Full xterm terminal, in your browser",
-  "version": "3.3.0",
-  "ignore": [
-    "demo",
-    "test",
-    ".gitignore"
-  ],
+  "version": "3.4.0",
   "main": "lib/Terminal.js",
   "types": "typings/xterm.d.ts",
   "repository": "https://github.com/xtermjs/xterm.js",
   "license": "MIT",
-  "files": [
-    "*.js",
-    "*.json",
-    "dist/*.css",
-    "dist/**/*.css",
-    "dist/*.js",
-    "dist/*.js.map",
-    "dist/**/*.js",
-    "dist/**/*.js.map",
-    "lib/*.css",
-    "lib/**/*.css",
-    "lib/*.d.ts",
-    "lib/*.js",
-    "lib/*.js.map",
-    "lib/**/*.d.ts",
-    "lib/**/*.js",
-    "lib/**/*.js.map",
-    "src/*.css",
-    "src/**/*.css",
-    "src/*.js",
-    "src/*.js.map",
-    "src/*.ts",
-    "src/**/*.js",
-    "src/**/*.js.map",
-    "src/**/*.ts",
-    "typings/*.d.ts"
-  ],
   "devDependencies": {
     "@types/chai": "^3.4.34",
     "@types/jsdom": "^11.0.1",
     "@types/mocha": "^2.2.33",
-    "@types/node": "^6.0.41",
+    "@types/node": "6.0.108",
     "@types/text-encoding": "0.0.32",
     "browserify": "^13.3.0",
     "chai": "3.5.0",
@@ -67,6 +35,7 @@
     "npm-run-all": "^4.1.2",
     "sorcery": "^0.10.0",
     "tslint": "^5.9.1",
+    "tslint-consistent-codestyle": "^1.13.0",
     "typescript": "~2.7.1",
     "vinyl-buffer": "^1.0.0",
     "vinyl-source-stream": "^1.1.0",
@@ -77,7 +46,7 @@
   "scripts": {
     "start": "node demo/app",
     "start-zmodem": "node demo/zmodem/app",
-    "lint": "tslint src/*.ts src/**/*.ts",
+    "lint": "tslint 'src/**/*.ts'",
     "test": "npm-run-all mocha lint",
     "test-debug": "node --inspect-brk node_modules/.bin/gulp test",
     "test-suite": "gulp mocha-suite --test",
@@ -90,6 +59,5 @@
     "coveralls": "gulp coveralls",
     "webpack": "gulp webpack",
     "watch": "gulp watch"
-  },
-  "dependencies": {}
+  }
 }