Add vimdiff as a difftool for Git.
Enable Vim to accept Ctr-S to save a file, and functions to save/restore sessions.