Some changes to zsh theme to handle mercurial and error return code