Add viminfo to .gitignore.
Merge branch 'fixing_submodule'