Replace custom vim delimiter matching with delimitMate
Set git core.editor = vim