Several changes
Merge branch 'master' of https://github.com/vim-bogota2/vi