Added git prompt
Merge branch 'master' of github.com:mcgruderlaw/dotfiles