Dont error if git-prompt is not present
Merge branch 'master' of github.com:rhythmx/bashrc

Conflicts:
	50_prompt.sh