Removed comments and other elements that might appear in the phing -l output. The current version doesn't work at all on my environment (OSX 10.7)
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:Fisiu/oh-my-zsh
Merge branch 'master' of github.com:Fisiu/oh-my-zsh
fix `-nt` usage
Changed brew cmd to properly report if awscli is installed via homebrew
additional tmux aliases
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:Fisiu/oh-my-zsh
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.
Change all whoami calls for $USER variable

This avoid spawning additional processes, as the $USER variable will
**always** contain the current logged-in user.
Change all pwd calls for $PWD variable

This avoids spawning additional processes as $PWD **always** contains
the current working directory.
Change all hostname calls for $HOST or $SHORT_HOST
Merge pull request #3223 from mcornella/use-special-vars

Use special variables where we can
Fixes the profiles-plugin

An error was introduced with 7f75bb9, which uses special vars. This is the
fix.
Merge pull request #3299 from apoxa/fix-profiles

Fix for the profile plugin.
Remove deprecated brew commands, update core commands

`brew services` and `brew server` were moved to homebrew-boneyard.
Merge simplified superjarin theme
Fix autojump script to support Nix installations
ignore any grep aliases that might be defined