VIM: misc updates
Merge branch 'master' of github.com:artnez/environment