* 'master' of https://github.com/sorin-ionescu/prezto: (63 commits)
Support $PYTHONUSERBASE per PEP 370
Create a default tmux session only when none defined in tmux.conf
Fix git-info added/deleted count formatting typo
[Fix#543] Do not set tmux destroy-unattached
Simplify multiplexer auto-start tests
Inform the user to load ruby as late as possible when using RVM
[Fix#551] Rename tmux auto-start session
Fix a test operator bug introduced in e5a0e33
[Fix#541] Do not auto-load screen/tmux inside of Emacs/Vim
Disable glob for bower
Prefix rarely used osx functions
Add functions to display and delete osx download history
Update osx alias descriptions
Make osx functions autoloadable
Cast AppleScript paths to text
Add capability to browse man pages in Dash.app
Remove Bwana.app support
Add double slash after Bwana.app's man protocol
[Fix#361] Load chruby when found
[Fix#535] Set Pacman frontend to 'pacman' when none set
...
* upstream/master:
Simplify a conditional
Remove duplicate alias definitions
Add utility aliases for Cygwin
Replace pythonz with pyenv
Update external syntax-highlighting
Update external history-substring-search
Update external completions
Clarify customization instructions
Move from Carton to Cask
Increase control over multiplexer auto-start
[Fix#459] Correct typos in the dpkg module
[Fix#452] Squash bugs introduced in fcab2a1
[Fix#411] Add Homebrew module
[Fix#434] Correct ambiguity in the use of the term keymap
- rearranged for better readability
- bolder angle brackets
- precise 24 hr time format option
- option to keep the clock updated (commented out because it messes with
tab completions)
- ruby-info is clearer
- now makes use of $SHLVL
- improved executions trace prompt
[ticket: X]
