Merge branch 'nkchanges' into 'master'

Updated python config

See merge request !10

vimrc

@@ -44,7 +44,7 @@ highlight ExtraWhitespaces ctermbg=202
 function! WhitespaceHighlight()
 	if &filetype == 'python'
 		call matchadd('ExtraWhitespaces','^\t')
-		set colorcolumn=100
+		set colorcolumn=132
 	elseif &filetype == 'yaml'
 		call matchadd('ExtraWhitespaces',' \t')
 		call matchadd('ExtraWhitespaces','\t ')
@@ -61,7 +61,7 @@ endfunction
 
 " Autocmd
 au BufNewFile,BufRead * call WhitespaceHighlight()
-au BufNewFile,BufRead *.sls set filetype=yaml | call WhitespaceHighlight()
+au BufNewFile,BufRead *.sls set filetype=python | set expandtab softtabstop=4 | call WhitespaceHighlight()
 au BufNewFile,BufRead *.md set filetype=markdown | call WhitespaceHighlight()
 au BufNewFile,BufRead *.html.ep set filetype=php | call WhitespaceHighlight()
 au BufNewFile,BufRead *.py set filetype=python | set expandtab softtabstop=4 | call WhitespaceHighlight()