Stashed support for fish
Merge pull request #34 from fernandolopez/develop

Stashed support for fish
aks: added gitstatus.sh, and configured it in gitprompt.sh
aks: added gitstatus.sh, and configured it in gitprompt.sh
Merge branch 'add-gitstatus.sh'

* add-gitstatus.sh:
  aks: added gitstatus.sh, and configured it in gitprompt.sh

Conflicts:
	README.md
	gitstatus.sh
aks: fixed order of config items
aks: added Cyan as a color, and used it for untracked files. Updated README
Merge pull request #36 from aks/master

Added git-status.sh and configure its use in gitprompt.sh.  Updated README.
Reinserted the missing '!' from the shebang line.
aks:externalize git prompt colors; add help func
aks: don't cause errors if the git-prompt-colors.sh file is missing
Associative arrays does not work on Bash 3 (OS X for instance). Change to ordinary variables to be more compatible.
Merge pull request #38 from ogr3/master

Associative arrays does not work on Bash 3 (OS X for instance). Change t...
Merge branch 'master' of https://github.com/aks/bash-git-prompt into aks-master
Added sourcing of git_prompt_help.sh to gitprompt.sh
Colorized git-prompt-help with configured colors and symbols
Fixed Symbols for ahead and behind
fix VIRTUAL_ENV prompt outside a git repository
Merge pull request #39 from linuxmaniac/vseva/fix_virtualenv

fix VIRTUAL_ENV prompt outside a git repository
removed unneeded calls to git_prompt_config