Merge branch 'develop' of github.com:MetaMask/metamask-extension into fix-etherscan-link-notifications

test/e2e/beta/run-drizzle.sh

@@ -7,10 +7,10 @@ sleep 5
 cd test/e2e/beta/
 rm -rf drizzle-test
 mkdir drizzle-test && cd drizzle-test
-sudo npm install -g truffle
-truffle unbox drizzle
+npm install truffle
+../../../../node_modules/.bin/truffle unbox drizzle
 echo "Deploying contracts for Drizzle test..."
-truffle compile && truffle migrate
+../../../../node_modules/.bin/truffle compile && ../../../../node_modules/.bin/truffle migrate
 BROWSER=none npm start >> /dev/null 2>&1 &
 cd ../../../../
 mocha test/e2e/beta/drizzle.spec