much faster git status checks
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  much faster git status checks

Conflicts:
	.bash_prompt
	README.md