sets up vim alias
Adds vimdiff as mergetool