Merge branch 'master' of github.com:MetaMask/metamask-plugin

package.json

@@ -32,7 +32,6 @@
     "eth-store": "^1.1.0",
     "ethereumjs-tx": "^1.0.0",
     "ethereumjs-util": "^4.3.0",
-    "faux-jax": "git+https://github.com/kumavis/faux-jax.git#c3648de04804f3895c5b4972750cae5b51ddb103",
     "hat": "0.0.3",
     "inject-css": "^0.1.1",
     "metamask-logo": "^1.1.5",
@@ -53,7 +52,7 @@
     "three.js": "^0.73.2",
     "through2": "^2.0.1",
     "web3": "^0.15.1",
-    "web3-provider-engine": "^7.2.1",
+    "web3-provider-engine": "^7.4.0",
     "xtend": "^4.0.1"
   },
   "devDependencies": {