Initial commit
Merge https://github.com/alexako/vim