Better gitconfig. Use Kaleidoscope for external diff/merge