update submodules
add riv.vim and conque-term
merge diff with ubuntu vim