corrected which alias
Merge branch 'master' of github.com:fergusb/zsh

* 'master' of github.com:fergusb/zsh:
  deactivated python3 alias
  added gpg-agent, improved virtualenvwrapper integration