some updates
Merge https://github.com/NSusoev/my-vimrc