gitconfig additions

- mergetool to use vimdiff
- increased git autocorrect time