Fixed colors so that runon commands do not overwrite prompt
added another location where __git_ps1 could be