Merge branch 'master' into NewUI

1 files changed, 9 insertions, 6 deletions

diff --git a/package.json b/package.json
index 0129583f7..a95f2c75f 100644
--- a/package.json
+++ b/package.json
@@ -7,10 +7,12 @@
     "start": "npm run dev",
     "dev": "gulp dev --debug",
     "disc": "gulp disc --debug",
-    "dist": "npm install && gulp dist",
+    "clear": "rm -rf node_modules/eth-contract-metadata && rm -rf node_modules/etheraddresslookup",
+    "dist": "npm run clear && npm install && gulp dist",
     "test": "npm run lint && npm run test-unit && npm run test-integration",
     "test-unit": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"",
     "test-responsive": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/responsive/**/*.js\"",
+    "single-test": "METAMASK_ENV=test mocha --require test/helper.js",
     "test-integration": "npm run buildMock && npm run buildCiUnits && testem ci -P 2",
     "lint": "gulp lint",
     "buildCiUnits": "node test/integration/index.js",
@@ -46,6 +48,7 @@
   },
   "dependencies": {
     "async": "^1.5.2",
+    "await-semaphore": "^0.1.1",
     "babel-runtime": "^6.23.0",
     "bip39": "^2.2.0",
     "bluebird": "^3.5.0",
@@ -56,19 +59,19 @@
     "copy-to-clipboard": "^2.0.0",
     "debounce": "^1.0.0",
     "deep-extend": "^0.4.1",
-    "denodeify": "^1.2.1",
     "detect-node": "^2.0.3",
     "disc": "^1.3.2",
     "dnode": "^1.2.2",
     "end-of-stream": "^1.1.0",
     "ensnare": "^1.0.0",
     "eth-bin-to-ops": "^1.0.1",
-    "eth-contract-metadata": "^1.1.3",
+    "eth-contract-metadata": "^1.1.4",
     "eth-hd-keyring": "^1.1.1",
     "eth-query": "^2.1.2",
-    "eth-sig-util": "^1.1.1",
+    "eth-sig-util": "^1.2.2",
     "eth-simple-keyring": "^1.1.1",
     "eth-token-tracker": "^1.1.2",
+    "etheraddresslookup": "github:409H/EtherAddressLookup",
     "ethereumjs-tx": "^1.3.0",
     "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
     "ethereumjs-wallet": "^0.6.0",
@@ -125,7 +128,7 @@
     "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
     "web3": "0.19.1",
-    "web3-provider-engine": "^13.1.1",
+    "web3-provider-engine": "^13.2.8",
     "web3-stream-provider": "^3.0.1",
     "xtend": "^4.0.1"
   },
@@ -175,7 +178,7 @@
     "react-addons-test-utils": "^15.5.1",
     "react-test-renderer": "^15.5.4",
     "react-testutils-additions": "^15.2.0",
-    "sinon": "^1.17.3",
+    "sinon": "^2.3.8",
     "tape": "^4.5.1",
     "testem": "^1.10.3",
     "uglifyify": "^3.0.1",