[vimrc] Remove ``riv.vim`` plugin
Merge remote-tracking branch 'origin/vimrc' into vimrc
Merge branch 'vimrc'