Merge remote-tracking branch 'origin/master' into vadviktor-patch-pyenv

README.md

@@ -13,7 +13,7 @@ simplicity, showing information only when it's relevant.
 
 It currently shows:
 - Current Python virtualenv; when using Pyenv and no active virtualenv shows the current Python version the shell uses
-- Current Ruby version using Rbenv; version and gemset when on RVM
+- Current Ruby version using Rbenv or chruby; version and gemset when on RVM
 - Current Node.js version, through NVM
 - Git status
 - Timestamp
@@ -106,6 +106,7 @@ or don't want to see. All options must be overridden in your **.zshrc** file.
 |--------|-------|-------|
 |`BULLETTRAIN_PROMPT_CHAR`|`\$`|Character to be show before any command
 |`BULLETTRAIN_PROMPT_ROOT`|`true`|Highlight if running as root
+|`BULLETTRAIN_PROMPT_SEPARATE_LINE`|`true`|Make the prompt span across two lines
 
 ### Status
 
@@ -205,28 +206,32 @@ most of the code was later erased and its now more closely related to
 of the project:
 
 ```
-82  Caio Gondim
-33  Jérémy Romey
-07  Jocelyn Mallon
-06  Jérémy Romey
-06  Dan Kaplun
-05  Arthur Wang
-04  Flavius Aspra
-04  Joe Block
-02  wujtruj
-02  itsZero (Chien-An Cho)
-01  m.kuehn
-01  Adrien Brault
-01  yachi
-01  Guillaume BINET
-01  Hannes Frank
-01  Kevin
-01  Mario Zigliotto
-01  Marius Krämer
-01  Michael Robinson
-01  gvillalta99
-01  illuminatis
-01  krischer
+100  Caio Gondim
+ 33  Jérémy Romey
+  7  Jocelyn Mallon
+  7  Greg Fitzgerald
+  6  Dan Kaplun
+  6  Jérémy Romey
+  6  Joe Block
+  5  Arthur Wang
+  4  Flavius Aspra
+  3  Viktor (Icon) VAD
+  3  Mario Zigliotto
+  2  wujtruj
+  2  itsZero (Chien-An Cho)
+  1  yachi
+  1  Andreas Galauner
+  1  Guillaume BINET
+  1  Hannes Frank
+  1  Kevin
+  1  Marius Krämer
+  1  Michael Robinson
+  1  Sébastien Bordenave
+  1  gvillalta99
+  1  illuminatis
+  1  krischer
+  1  m.kuehn
+  1  Adrien Brault
 ```
 
 ## Credits