diff --git a/vim/ftplugin/python.vim b/vim/ftplugin/python.vim
index 401bcc5..849bf46 100644
--- a/vim/ftplugin/python.vim
+++ b/vim/ftplugin/python.vim
@@ -1 +1,7 @@
 nnoremap <F8> :%!autopep8 -<CR>
+setlocal tabstop=4
+setlocal softtabstop=4
+setlocal shiftwidth=4
+setlocal textwidth=80
+setlocal smarttab
+setlocal expandtab
diff --git a/vimrc b/vimrc
index 167ea32..8d1bd03 100644
--- a/vimrc
+++ b/vimrc
@@ -104,7 +104,7 @@ endfunction
 
 " Options for syntastic
 let g:syntastic_enable_signs = 1
-let g:syntastic_auto_lock_list = 2
+let g:syntastic_auto_loc_list = 2
 " Have F5 run the tests and display errors
 nnoremap <silent> <F5> :SyntasticCheck<CR> :Errors<CR>