Merge remote-tracking branch 'upstream/master'

* upstream/master: (41 commits)
  fixed typo in tmux plugin
  Update coffee completion
  The current version of bower is completely unavailable, plugin depth modification
  rvm plugin: update to ruby version helpers and rvm-update
  Change duplicated alias name
  Add autocompletion for Rails3.
  Add more capable hg incoming and outgoing count handling
  Add celery completion
  add virtualenv prompt support for agnoster theme
  git-pull add --rebase option
  Typo
  Prevent starting multiple gpg-agents
  Not loading home tmux confs when iTerm2 tmux integration is enabled
  Adding support for iTerm2 tmux integration via option '-CC'
  remove unused function
  autocomplete required packages as second argumet
  debian plugin: ignore alias in sudo/aptitude check
  Add new plugin for homebrew installed version of postgres
  Do not clear tab when calling it with an argument.
  Correctly detect Rapid Board
  ...
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'cadusk/master'
Merge https://github.com/robbyrussell/oh-my-zsh/pull/1961


Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
Add and fix git aliases

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
Merge branch 'stibbons_fix_git_aliases'

Conflicts:
	plugins/git/git.plugin.zsh