Merge branch 'master' of http://github.com/kmalloc/vim