More tabs options
Removes trailing spaces
Merge branch 'master' of github.com:PierreRambaud/Vim-config