diff --git a/vim/.vim/plugins.vim b/vim/.vim/plugins.vim
index 70ee4b12..38a2e002 100644
--- a/vim/.vim/plugins.vim
+++ b/vim/.vim/plugins.vim
@@ -48,4 +48,5 @@ call plug#begin('~/.vim/plugged')       " Use vim-plug as our package manager of
     Plug 'chrisbra/csv.vim'             " Add CSV support
     Plug 'Glench/Vim-Jinja2-Syntax'     " Add Jinja2 support
     Plug 'mustache/vim-mustache-handlebars' " Add mustache and handlebars support
+    Plug 'plasticboy/vim-markdown'          " Add more markdown support (LaTeX, frontmatter, etc.)
 call plug#end()                         " Start the plugins
diff --git a/vim/.vimrc b/vim/.vimrc
index d7eec223..2ce312ab 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -130,4 +130,15 @@ autocmd BufNewFile,BufRead *.slang setlocal filetype=slim
 
 " Use htmldjango for html files
 " autocmd BufNewFile,BufRead *.html setlocal filetype=htmldjango
-autocmd BufNewFile,BufRead *.html setlocal filetype=html
+" autocmd BufNewFile,BufRead *.html setlocal filetype=html
+autocmd BufNewFile,BufRead *.html setlocal filetype=jinja
+
+" Disable vim-markdown folding
+let g:vim_markdown_folding_disabled = 1
+let g:vim_markdown_math = 1
+let g:vim_markdown_frontmatter = 1
+autocmd BufNewFile,BufRead *.md set conceallevel=2
+" au BufNewFile,BufRead,BufWrite *.md syntax match Comment /\%^---\_.\{-}---$/
+
+" Change cursor back to blink after exiting neovim
+au VimLeave * set guicursor=a:block-blinkon1