Mixed changes
Add mercurial location of vim