Added vimdiff as git's merging tool