Fix grep colors
Add kaleidoscope as default diff/merge tool