Merge pull request #1620 from hreese/gpg-agent_with_sensible_ssh-agent

Disable ssh-agent support in gpg-agent-plugin if another ssh-agent is already available.
Merge pull request #1223 from bigjust/master

Basic Virtualenv plugin
Resolving conflict with merge of #970
Merge pull request #1569 from ZeroKnight/master

Better custom theme loading
Merge pull request #818 from jmacdonald/master

Alias for 'git diff'
Merge pull request #1088 from avit/avit-theme

avit theme
Updating the README file
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
Merge pull request #1053 from cwoodcox/master

Added a neat theme called half-life. It's pretty and quite functional.
Merge pull request #922 from sbfaulkner/master

patch rbenv support for themes
Resolving conflict when merging in #528
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
Merge pull request #424 from hackedy/fix

use /home/ryan/d/.oh-my-zsh instead of ~/.oh-my-zsh for cache
Merge pull request #711 from jasongill/textmate-plugin-improvement

Improvements to the tm command in the TextMate plugin
Merge pull request #1225 from bobmaerten/patch-1

vagrant uses 'ssh-config' command, not 'ssh_config'
Merge pull request #1102 from drnic/git-config

More git aliases
Merge pull request #1091 from jmazzi/patch-1

Improve README; Instructions for handling updates
Merge pull request #917 from agate/patch-1

added "publish" and "track" command completion for git-flow plugin
Merge pull request #1633 from alec-c4/master

rails4 plugin
Resolving conflict with merge of #1058