add catcat
improve emacs git-diff and auto-columns
Merge branch 'master' of github.com:shicks/config