diff --git a/dotfiles/config/nvim/init.vim b/dotfiles/config/nvim/init.vim
index 8a44ff3..83ba351 100644
--- a/dotfiles/config/nvim/init.vim
+++ b/dotfiles/config/nvim/init.vim
@@ -45,7 +45,6 @@ Plug 'derekwyatt/vim-scala'
 Plug 'leafgarland/typescript-vim'
 Plug 'kchmck/vim-coffee-script'
 Plug 'rust-lang/rust.vim'
-Plug 'klen/python-mode'
 Plug 'groenewege/vim-less'
 Plug 'cakebaker/scss-syntax.vim'
 Plug 'pangloss/vim-javascript'
@@ -57,6 +56,10 @@ Plug 'OCamlPro/ocp-indent'
 Plug 'slim-template/vim-slim'
 Plug 'isRuslan/vim-es6'
 
+" Flake8 Integration
+Plug 'nvie/vim-flake8'
+
+
 " SBT integration for vim
 Plug 'ktvoelker/sbt-vim'
 
@@ -157,6 +160,9 @@ autocmd BufRead,BufNewFile *.rs set filetype=rust
 " Set column width to 80 only on python files
 autocmd BufNewFile,BufRead *.py setlocal colorcolumn=80
 
+" Set Python syntax checking to Python3
+let python_highlight_all=1
+
 " Indent YAML files correctly
 au FileType yaml setlocal tabstop=2 expandtab shiftwidth=2 softtabstop=2