Add mercurial and vim improves