new git prompt
Merge branch 'master' of github.com:fergusb/zsh

* 'master' of github.com:fergusb/zsh:
  new git prompt