Make changes to the mac setup.

- Removed mercurial
- Add MacVim