After updating the janus vim distribution there appears to be a problem with using vim for commit messages. The best example of this is when doing a
error: There was a problem with the editor 'vi'.
Not committing merge; use 'git commit' to complete the merge.
After a bit of googling, it turns out that the answer is to run the following:
git config --global core.editor /usr/bin/vim