Moved on to vimdiff as a mergetool
Upgraded all submodules