Modified with my configuration
Merge branch 'master' of github.com:corelon/prezto
Simplify multiplexer auto-start tests
[Fix #543] Do not set tmux destroy-unattached

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
Fix git-info added/deleted count formatting typo

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
Create a default tmux session only when none defined in tmux.conf

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
Support $PYTHONUSERBASE per PEP 370

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
Merge remote-tracking branch 'upstream/master'