make diff.tool an option on gitconfig
Merge branch 'master' of github.com:doug/dotfiles