Merge branch 'master' into 1544-windows-istty

README.md

@@ -32,7 +32,7 @@ You can install Terminus just about anywhere on your system. In this README, we'
 ### Installing via the Terminus installer
 Run this in your Terminal client:
 ```bash
-curl -O https://raw.githubusercontent.com/pantheon-systems/terminus-installer/master/builds/installer.phar && php installer.phar
+curl -O https://raw.githubusercontent.com/pantheon-systems/terminus-installer/master/builds/installer.phar && php installer.phar install
 ```
 For more information on installation options, please see the [Terminus Installer README.md file](https://github.com/pantheon-systems/terminus-installer).
 

src/Collections/SavedTokens.php

@@ -99,7 +99,7 @@ protected function getCollectionData($options = [])
     {
         $tokens = [];
         foreach ($this->getDataStore()->keys() as $key) {
-            $tokens[] = $this->getDataStore()->get($key);
+            $tokens[] = (object)$this->getDataStore()->get($key);
         }
         return $tokens;
     }

src/DataStore/FileStore.php

@@ -34,7 +34,7 @@ public function get($key)
         $path = $this->getFileName($key);
         if (file_exists($path)) {
             $out = file_get_contents($path);
-            $out = json_decode($out);
+            $out = json_decode($out, true);
         }
         return $out;
     }