Merge branch 'master' into remote-storage

Conflicts:
	chrome/vault.html
	node/cli.js
	node/composite_store.js
	node/local_store.js
	node/usage.txt
	package.json
	spec/node.js
	spec/node/cli_spec.js
	web/index.html

chrome/vault.html

@@ -5,9 +5,6 @@
     <title>Vault</title>
     <script src="./lib/crypto-js-3.1.2.js"></script>
     <script src="./lib/vault.js"></script>
-    <script src="./lib/adapter.js"></script>
-    <script src="./lib/remotestorage.js"></script>
-    <script src="./lib/remote_store.js"></script>
     <link rel="stylesheet" href="./lib/style.css">
     <link rel="stylesheet" href="./style.css">
   </head>