Clean up vim settings
Merge branch 'master' of https://github.com/shkh/dotfiles