Defined vimmdiff as my git difftool
Minor tweaks and improvements