Fixed bug in git branch detection on detached head
Merge branch 'master' into imo-dell

Conflicts:
	.zdir/functions/prompt_git_info

git cyan color in prompt now comes from the function, not from the prompt