Merge branch 'master' of github.com:harnash/bash-git-prompt