merged in master
fixing submodules again
updated all vim plugins