Fix one annoyance

Conflicts:
	zshrc
Cool git log stuff