Set difftool and mergetool to be vimdiff
Fix bad whitespace