OpenBSD doesn't have -ef flags for ps. Both linux and OpenBSD have -x flags which works just as greate here
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of https://github.com/mgutz/oh-my-zsh
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
ohmyzsh plugin of the z project: https://github.com/rupa/z
fix gpg-agent "running already" check

The GPG_ENV file is sourced before doing the gpg-connect-agent check,
but this file (unlike the SSH_ENV file) doesn't export GPG_AGENT_INFO,
so the check always fails.  This results in new gpg-agents continuously
being spawned.

All this commit does is put in the single export to fix the problem.
PLUGIN: gpg-agent: export SSH_* environment variables too

If using the gpg-agent with --enable-ssh-support, the SSH_AUTH_SOCK and
SSH_AGENT_PID environment variables need to be exported once sourced
from GPG_ENV.  Otherwise, we get no benefit from the persisting these
values to GPG_ENV; subsequent openned terminals don't see the existent
gpg-agent as a process for an SSH daemon.
Add commonly used git stash aliases
Check bundler version to avoid error with unsupported command line arguments
Add support for ForkLift 2 to the ForkLift plugin

The ForkLift plugin now supports ForkLift 2 as well as ForkLift 1.
If ForkLift is not running it also waits for it to be running before
trying to switch to the specified directory
More expressive symbols for git and mercurial.
Added '.war' extension to unzip
Added '.jar'
Added gitignore plugin ( for gitignore.io )
Updated completion to work with comma seperated list
Merge pull request #2145 from futjikato/master

Added gitignore.io custom plugin
Merge pull request #2139 from deiga/patch-1

Added '.war' extension to unzip
Merge pull request #2132 from jkaving/forklift2

Add support for ForkLift 2 to the ForkLift plugin
gitignore fix for custom folder.
Moved misplaced plugins.