diff --git a/.vim/vimrc b/.vim/vimrc
index 19aa60b..0ef2e2a 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -36,8 +36,8 @@ match WhitespaceEOL /\s\+\%#\@<!$/
 " Remove all trailing whitespace by pressing Ctrl+k
 nnoremap <C-k> :let _s=@/<Bar>:%s/\s\+$//e<Bar>:let @/=_s<Bar><CR>
 
-" Language indents
-autocmd FileType py         set textwidth=79
+" Language indents and line lengths
+autocmd FileType py,rst,md  set textwidth=79
 autocmd FileType html       set softtabstop=2 shiftwidth=2 omnifunc=htmlcomplete#CompleteTags
 autocmd FileType yaml       set softtabstop=2 shiftwidth=2
 autocmd FileType css        set softtabstop=2 shiftwidth=2 omnifunc=csscomplete#CompleteCSS
diff --git a/.vim/vundlerc.vim b/.vim/vundlerc.vim
index 176685c..09c12d0 100644
--- a/.vim/vundlerc.vim
+++ b/.vim/vundlerc.vim
@@ -24,6 +24,7 @@ let g:scala_scaladoc_indent = 1
 Plugin 'elmcast/elm-vim'
 Plugin 'rust-lang/rust.vim'
 Plugin 'racer-rust/vim-racer'
+Plugin 'Rykka/riv.vim'
 
 " Async Lint Engine
 Plugin 'w0rp/ale'