Merge commit '062bc6180fae3319bb5bc432582faeb453e3c2a4' into ethereumjs

libjsqrc/ethereumjs/dist/ethereum.js

@@ -394,7 +394,7 @@ module.exports = AutoProvider;
 
 // TODO: is these line is supposed to be here? 
 if ("build" !== 'build') {/*
-    var web3 = require('./web3'); 
+    var web3 = require('./web3'); // jshint ignore:line
 */}
 
 var abi = require('./abi');

libjsqrc/ethereumjs/lib/contract.js

@@ -22,7 +22,7 @@
 
 // TODO: is these line is supposed to be here? 
 if (process.env.NODE_ENV !== 'build') {
-    var web3 = require('./web3'); 
+    var web3 = require('./web3'); // jshint ignore:line
 }
 
 var abi = require('./abi');