First commit
Merge https://github.com/TaDaa/vim