Update vim plugins
Merge branch 'master' into users/svalaskevicius