Add vimdiff explicitly as the difftool of choice