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'
aks: fixed bug in original/master parameter replacement; resolved trivial conflicts