set shiftwidth=4
update .vim and .vimrc
Merge branch 'master' of https://github.com/georgschlenkhoff/dotfiles