Merge branch 'master' into walkThrough

CHANGELOG.md

@@ -5,6 +5,7 @@
 ## 2.13.6 2016-10-26
 
 - Add a check for improper Transaction data.
+- Inject up to date version of web3.js
 - Now nicknaming new accounts "Account #" instead of "Wallet #" for clarity.
 - Fix bug where custom provider selection could show duplicate items.
 - Fix bug where connecting to a local morden node would make two providers appear selected.

package.json

@@ -82,7 +82,7 @@
     "three.js": "^0.73.2",
     "through2": "^2.0.1",
     "vreme": "^3.0.2",
-    "web3": "ethereum/web3.js#260ac6e78a8ce4b2e13f5bb0fdb65f4088585876",
+    "web3": "0.17.0-beta",
     "web3-provider-engine": "^8.1.5",
     "web3-stream-provider": "^2.0.6",
     "xtend": "^4.0.1"