first commit
Merge https://github.com/friolz/vim