Add bbundle alias
Use keymaps instead of macros for refactoring
Use lowercase email in git config
Remove obsolete kaleidoscope difftool
Use diff3 style in merges by default