Changes difftool to Kaleidoscope.
Adds gq for grepping git shell aliases.
Merge branch 'master' of github.com:misanthropicgeek/dotfiles