Cleaned up zsh config. Added git functionality to right prompt
Merge branch 'laptop' of github:cmacrae/dotfiles into laptop