use feature names instead of failing branch names in "git flow feature"
fixes #1474 add zeus to bundle exec listx
Add Stash toogle to display if there's some stash or not in `git_prompt_status`
Merge pull request #1477 from madsgraphics/git_prompt_showstashstate

Add Stash toogle to display if there's some stash or not in `git_prompt_status`
Merge pull request #1475 from westonplatter/master

fixes #1474 add zeus to bundle exec list
Merge pull request #1473 from bsteuber/fix-git-flow-feature-completion

use feature names instead of failing branch names in "git flow feature"
Revert "agnoster theme shows error code instead of an "x""

This reverts commit f09af5717923cca4e5c538e14846ea4816295949.

It is far more aesthetically pleasing, and conveys the correct amount of information. The exact numeric status code is extremely rarely of use, and increases cognitive parsing burden on the user.
(cherry picked from commit 8f664edcaf55adcc540f0fe43d4205b66e4f9fb6)
add unbundled command
Fixes #1489

Revert "Fixed Mac OS X Terminal.app related issue with extra newlines being printed out sometimes"

This reverts commit 8f89d4d5a5d584bae288d8111d83a6489a1369dc.
Merge pull request #1517 from thisiskun/master

provide the unbundled commands
Merge pull request #1510 from agnoster/agnoster-classic

agnoster "classic"
setup homebrew's path, manpath and alias
add emacs plugin

* don't use zle inside emacs
Merge branch 'develop'

Conflicts:
	plugins/emacs/emacs.plugin.zsh