Use MacVim as core editor.
vimrc fixes for git
Remove *.orig files on merging.
Kaleidoscope diff/merge tool