merge package.json conflict

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "iojs"
+  - "4.0"
 
 branches:
   only:

package.json

@@ -6,7 +6,9 @@
   "scripts": {
     "test": "./node_modules/.bin/lab tests/*-test.js",
     "coverage": "./node_modules/.bin/lab -t 100 tests/*-test.js",
-    "codestyle": "./node_modules/.bin/standard --format"
+    "codestyle": "./node_modules/.bin/standard --format",
+    "lint": "jshint .",
+    "validate": "npm ls"
   },
   "keywords": [
     "IPFS"
@@ -17,6 +19,9 @@
     "codestyle",
     "test"
   ],
+  "engines": {
+    "node": "^4.0.0"
+  },
   "bugs": {
     "url": "https://github.com/diasdavid/node-peer-id/issues"
   },
@@ -31,4 +36,4 @@
     "bs58": "^2.0.1",
     "multihashing": "^0.1.3"
   }
-}
+}