Added git merge tool and hash size
Lost color output so now it's explicit
Added ignore rules where I can find them
Removed Vim netrwhist noise
Fixed color output in zsh ...

... I think

BSD and GNU ls are incompatible on color output.

BSD ls uses -G for color output; ls -G is a group listing on GNU.

But they both respect the shell value of CLICOLOR, and that does seem to
work here.

The grep color options aren't really helpful or even valid, so they're
gone too.
Trying out solarized theme
Merge branch 'master' of ssh://badwolf.local/Users/ewk/Documents/Depot/dotfiles
Revert "Trying out solarized theme"

This reverts commit b82e9c6acae79ca9e362f1f31156dce4adb589b3.
Merge branch 'master' of ssh://badwolf.local/Users/ewk/Documents/Depot/dotfiles
Trying out Solarized theme - reinstalled submodule