Merge remote-tracking branch 'origin/0_1_0_fixes' into develop

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -28,7 +28,7 @@
     "highlight.js": "^8.9.1",
     "linkifyjs": "^2.0.0-beta.4",
     "marked": "^0.3.5",
-    "matrix-js-sdk": "https://github.com/matrix-org/matrix-js-sdk.git#develop",
+    "matrix-js-sdk": "^0.4.0",
     "optimist": "^0.6.1",
     "q": "^1.4.1",
     "react": "^0.14.2",