Saving state.
Fixing branch display to support newer versions of git.

Conflicts:
	.zshrc