vim
Merge branch 'master' into desktop
removed modules
upd