Git mergetool
Ignore vim files
Cleaning some plugins and adding Utilsnips