Don't execute modeline after colorscheme changes
Use tabstop if expandtab is not set
Merge branch 'master' of https://github.com/wilywampa/vim-indent-guides