aks: only define the colors once
aks: only define the colors once
aks: optimzations; don't lookup the same files over and over
aks: aesthetic touchups
Merge branch 'master' of https://github.com/aks/bash-git-prompt into aks-master

Conflicts:
	git-prompt-colors.sh
	gitprompt.sh
Merge branch 'aks-master'