fix delim_color for virtualenv
Merge branch 'delimcolor'

* delimcolor:
  fix delim_color for virtualenv

Conflicts:
	git-prompt.sh