more changes
Merge branch 'master' of https://github.com/JakAlof/vim