Move zsh environment changes to zshenv
Use hub in place of git if it exists
Use -sb with git status