Git fixes
Merge branch 'master' of https://github.com/akolosov/vim-config
Merge branch 'master' of https://github.com/akolosov/vim-config