aks:testing new file in local, but not in remote
Merge remote-tracking branch 'original/master'

* original/master:
  Fixed Symbols for ahead and behind
  Colorized git-prompt-help with configured colors and symbols
  Added sourcing of git_prompt_help.sh to gitprompt.sh
  Associative arrays does not work on Bash 3 (OS X for instance). Change to ordinary variables to be more compatible.
Adds support to show Conda environment on prompt

When one uses a Virtualenv environment, its name is shown in the prompt.
The same did not happen with a Conda environment. This fix it.
Merge pull request #57 from gabraganca/conda

Adds support to show Conda environment on prompt
Implemented the possibility for an indicator which shows the result of the last command.
To enable just write

export GIT_PROMPT_SHOW_LAST_COMMAND_INDICATOR=1

just before sourcing the gitprompt.sh

fixes #60
Implemented a per repository possibility to turn of the fetching of the remote status (fixes #59)
Added a configuration variable to globally disable the remote fetching (also fix for #59)
Updated README
Modify gitstatus.sh to detect local branch without tracking remote
Merge pull request #61 from MatiasFernandez/mark_local_branch

Modify gitstatus.sh to detect local branch without tracking remote
Update gitprompt.sh

Remove trailing whitespaces
Merge pull request #62 from ChoiZ/patch-2

Update gitprompt.sh
Add spec file to build rpm package
Merge pull request #64 from schnell18/master

Add spec file to build rpm package
aks: refactor prompt color names & generation into separate file
aks: make the prompt vars all global
aks: major rewrite with refactored colors, envar management
aks: added space after the flags to improve readability
aks: updated README.md
aks:testing new file in local, but not in remote