Use env instead of fixed path
Use own colors
Merge branch 'master' into own

Conflicts:
	gitprompt.sh