Switch back to bling/dotvim and update submodules