Changed brew cmd to properly report if awscli is installed via homebrew
Added VIRTUAL_ENV_DISABLE_PROMPT to steeef.zsh-theme

This stops the virtual env name from being printed before it is actually being
used in the zsh prompt.
Merge simplified superjarin theme
Fix autojump script to support Nix installations
[~] fix plugin pj

https://github.com/robbyrussell/oh-my-zsh/commit/bce74975d055529cbd186782e2fd99e6da840460
Switch back to oh-my-zsh.hide-dirty setting again

Commit 81004dfaba509ff62a13ba303ab941938d619326 reverted the change
in 9b811fb625c03c30a766191cdf65a1c7c1fd96b2 when editing the merge
conflict from #2928.

This commit fixes that so that we don't make the same mistake again.

First seen in http://git.io/Cdaj5Q
Merge pull request #3323 from alfss/fix-pj

[~] fix plugin pj
Merge pull request #3333 from mcornella/fix-git-hide-dirty

Switch back to oh-my-zsh.hide-dirty setting again
Fix Yosemite broken zsh where $PATH var does not get appended correctly.

Sourcing oh-my-zsh immediately after export PATH.
use pigz if available in extract plugin
Merge pull request #3309 from jarinudom/superjarin

Simplify superjarin theme and support chruby
Merge pull request #3283 from jaapz/master

Added VIRTUAL_ENV_DISABLE_PROMPT to steeef.zsh-theme
Merge pull request #3265 from thii/fix-yosemite-broken

Fix Yosemite broken zsh
Merge pull request #3092 from MWers/aws-brew-issue

[aws plugin] Changed brew cmd to properly report if awscli is installed via homebrew
Merge pull request #2871 from wrboyce/extract-pigz

use pigz if available in extract plugin
Merge pull request #2448 from gawashburn/master

Fix autojump script to support Nix installations
Merge remote-tracking branch 'upstream/master'
ssh to melvin alias added
add back ssh aliases to connect Nanjing university servers.