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 Yosemite broken zsh where $PATH var does not get appended correctly.

Sourcing oh-my-zsh immediately after export PATH.
Change default theme
add new Sharking Theme

Changed by Kafeitu.zsh-theme
Add > sign at end
add Alias and some plugin
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'

Conflicts:
	templates/zshrc.zsh-template
Merge branch 'master' of git://github.com/SharkIng/oh-my-zsh

Conflicts:
	templates/zshrc.zsh-template-j
	themes/sharking.zsh-theme
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh into robbyrussell-master
Merge branch 'robbyrussell-master'