Update submodules

Also fix vimwiki location.