zshrc, gitconfig: allow "gits t"
Merge branch 'master' of https://github.com/nitnelave/config

* 'master' of https://github.com/nitnelave/config:
  gmerge: default to current branch, fail for master