Fix bash prompt to work with current versions of Git
Merge branch 'master' of github.com:onlyafly/personal-settings