Use `__git_ps1` for current git branch
Merge branch 'master' of https://github.com/haosu/dot

* 'master' of https://github.com/haosu/dot:
  Remove git alias for ssh-ensure-agent
  Add gerrit to git users
  Turn tmux aggressive-resize off
  Add skip test variations of git amend and commit