Merge branch 'master' of github.com:thomasba/dot-files

vim/ftplugin/python.vim

@@ -10,7 +10,7 @@ let python_highlight_space_errors = 1
 let python_highlight_builtins = 1
 
 " Enable jumping to imports with gf
-python << EOF
+python3 << EOF
 import os
 import sys
 import vim

vim/plug.vim

@@ -74,6 +74,7 @@ Plug 'chase/vim-ansible-yaml', { 'for': 'yaml' }
 Plug 'jamessan/vim-gnupg'
 Plug 'docunext/closetag.vim', { 'for': ['html','php']  }
 Plug 'lilydjwg/colorizer', { 'for': ['html','php','css','sass','scss'] }
+Plug 'lepture/vim-jinja', { 'for': ['html'] }
 Plug 'Townk/vim-autoclose'
 Plug 'junegunn/goyo.vim', { 'on': 'Goyo' }
 Plug 'chrisbra/vim-diff-enhanced'

vim/vimrc

@@ -267,4 +267,7 @@ set statusline+=%#warningmsg#
 set statusline+=%{SyntasticStatuslineFlag()}
 set statusline+=%*
 
+let g:pymode_python = 'python3'
+set modeline
+
 com! FormatJSON %!python -m json.tool