Rearrange path variables

I did this because `git` was using the Apple one, and not the homebrew
version. This was realised after I the upgrade to Mavericks made
`vi-mode` in zsh super slow.