Use vim as the standard editor
Add a note about the git branch