Changed to use vcs_info for prompt rather than custom code
Merge branch 'master' of github.com:brianriley/dotfiles