Removed old local zshrc.
Merge branch 'master' of https://github.com/cmh/dotfiles
Updated hgignore.