Squashed 'zsh/prezto/' changes from f8f93d4b..6e179f24
Squashed 'zsh/prezto/' changes from f8f93d4b..6e179f24

6e179f24 Export VIRTUAL_ENV_DISABLE_PROMPT when enabling virutalenv

git-subtree-dir: zsh/prezto
git-subtree-split: 6e179f24ab606f5c38d12b333771b4ba6b087eba

skjerven/dotfiles,skjerven/dotfiles,skjerven/dotfiles