Update to newest change
Merge branch 'master' of https://github.com/hafenr/vim