Add Vim as default git editor.
Use Vim as main editor more generally.
Merge fix