Merge branch 'master' into thinFont

3 files changed, 32 insertions, 3 deletions

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 470591323..8a5ffb75a 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -89,10 +89,12 @@ module.exports = class MetamaskController {
     })
 
     function logger (err, request, response) {
-      if (err) return console.error(err.stack)
+      if (err) return console.error(err)
       if (!request.isMetamaskInternal) {
         console.log(`RPC (${originDomain}):`, request, '->', response)
-        if (response.error) console.error('Error in RPC response:\n' + response.error.message)
+        if (response.error) {
+          console.error('Error in RPC response:\n', response.error)
+        }
       }
     }
   }
diff --git a/docs/video_script.txt b/docs/video_script.txt
new file mode 100644
index 000000000..bb707b394
--- /dev/null
+++ b/docs/video_script.txt
@@ -0,0 +1,27 @@
+Hi, and welcome to MetaMask.
+
+Today we’re happy to share our gift to the Ethereum ecosystem.
+
+The MetaMask browser extension turns an ordinary browser like Chrome into an Ethereum browser, letting websites get data from the blockchain, and letting users securely manage identities and sign transactions.
+
+When you start up MetaMask, you are given a seed phrase that can be used to restore all the accounts you ever create within MetaMask.
+
+You can switch the current account with the switch account button in the top right, and you can add more accounts at the bottom of the account list.
+
+Your account vault is stored encrypted within your browser, and it never touches our servers, but with your secret phrase, you can easily seed a new vault with the same accounts.
+
+You can send ether from within MetaMask like any wallet, but where MetaMask really shines is how it lets you visit Ethereum enabled websites.
+
+Here’s a simple Ethereum distributed app, or Ðapp, called Tokens, that lets you easily deploy your own currency.
+
+When you visit a Dapp like Tokens with MetaMask installed, that website has access to the Ethereum blockchain via the standard Web3 Javascript API, and when it wants to write to the blockchain, it just asks web3 to send the transaction, and MetaMask asks for the user’s permission first.
+
+After you submit a transaction, you have to wait for the next block for the change to be reflected on the website, and there it is!
+
+Now I have my own MetaMaskCoins! I can check my balance, or if I want to send some to another account, I can click the copy link on it, and then check its balance, see it has none, then send it some meta-coins!
+
+And this has been nice, but it’s all been on the test-net. I can always switch what blockchain I’m working on to the main-net, and I’m ready issue a token with the full security of the Ethereum blockchain.
+
+MetaMask connects to these blockchains with no synchronization time, because we host blockchain nodes by default, but you can always point MetaMask at your own Ethereum RPC Server, and fully control your connection to the blockchain.
+
+So that’s how MetaMask lets ordinary websites talk to a trusted Ethereum provider, while letting the user store and manage their own private keys. We hope this will help enable a new wave of blockchain-enabled websites.
\ No newline at end of file
diff --git a/package.json b/package.json
index 413c19ca5..991af4907 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "start": "gulp dev",
     "test": "mocha --require test/helper.js --compilers js:babel-register --recursive",
     "watch": "mocha watch --compilers js:babel-register --recursive",
-    "ui": "beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./"
+    "ui": "node development/genStates.js && beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./"
   },
   "browserify": {
     "transform": [