Small tweaks

 - Better terminal color support for vimrc
 - Mercurial support in zshrc