update indent to 4 spaces
update prompt colors
update fetch timeout to 1mn
Merge remote-tracking branch 'upstream/master'

Conflicts:
	gitprompt.sh
	gitstatus.py
remove trailing spaces
update git-prompt-colors
update prompt
Merge branch 'master' of https://github.com/ChoiZ/bash-git-prompt

Conflicts:
	git-prompt-colors.sh
	gitprompt.sh