Merge pull request #185 from nico/vim