gitconfig: Annotate "git log" with branches/tags
updated ohmyzsh
Removed a change that made it difficuilt to resolve conflicts
Merge branch 'master' of github.com:jesseschalken/dotfiles
Revert "Removed a change that made it difficuilt to resolve conflicts"

This reverts commit 396ef12fd4b8877fa8d1ddcf608ab9d89c440d6f.

Conflicts:
	.gitconfig