Change diff tool to vimdiff
Update submodules