Lots of vimrc stuff

.vimrc

@@ -49,7 +49,7 @@ let g:terraform_completion_keys = 1
 " (Optional) Default: 1, enable(1)/disable(0) terraform module registry completion
 let g:terraform_registry_module_completion = 0
 
-" let g:pymode_python = 'python3'
+let g:pymode_python = 'python3'
 
 " set the runtime path to include Vundle and initialize
 set rtp+=~/.vim/bundle/Vundle.vim
@@ -78,6 +78,10 @@ Plugin 'gmarik/Vundle.vim'
 " Go Plugin:
 "Plugin 'fatih/vim-go'
 Plugin 'vim-scripts/indentpython.vim'
+Plugin 'hashivim/vim-terraform'
+Plugin 'vim-syntastic/syntastic'
+Plugin 'juliosueiras/vim-terraform-completion'
+Plugin 'saltstack/salt-vim'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -103,17 +107,24 @@ au BufNewFile,BufRead *.py
     \ set tabstop=4 |
     \ set softtabstop=4 |
     \ set shiftwidth=4 |
-    \ set textwidth=79 |
     \ set expandtab |
     \ set autoindent |
+    \ set foldmethod=syntax |
     \ set fileformat=unix
 
+au BufNewFile,BufRead *.json
+    \ set filetype=json |
+    \ set foldmethod=syntax
+
 " But not for most files
 au BufNewFile,BufRead *.js, *.html, *.css
     \ set tabstop=2 |
     \ set softtabstop=2 |
     \ set shiftwidth=2
 
+au BufNewFile,BufRead *.sls
+    \ set filetype=sls
+
 " Flag bad whitespace
 " I hate this because it highlights while i'm writing
 "highlight BadWhitespace ctermfg=16 ctermbg=253 guifg=#000000 guibg=#F8F8F0
@@ -121,4 +132,6 @@ au BufNewFile,BufRead *.js, *.html, *.css
 
 let g:terraform_fold_sections=1
 let g:terraform_align=1
-
+let g:terraform_fmt_on_save=0
+let g:syntastic_python_python_exec = 'python3'
+let g:syntastic_python_checkers = ['python']