Update gitprompt.sh

Remove trailing whitespaces
Merge pull request #54 from ChoiZ/patch-1

Update gitprompt.sh
Fix PROMPT_COMMAND setGitPrompt cumulation when re-sourcing gitprompt.sh

Repeated calls of:
    source .bash-git-prompt/gitprompt.sh
lead to cumulation:
    PROMPT_COMMAND=setGitPrompt;setGitPrompt;...
rendering everything slow
Merge pull request #55 from Bost/prompt-command

Fix PROMPT_COMMAND setGitPrompt cumulation when re-sourcing gitprompt.sh
Move last little bit of script into a function so local is available
Merge pull request #56 from erikpukinskis/master

Move last little bit of script into a function so local is available
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.
Fix an error when opening a new tab from terminal

Opening a new tab from a terminal where the current path is not $HOME I get the following error :

```
bash: .bash-git-prompt/gitprompt.sh: No such file or directory
```
Merge pull request #58 from a14n/patch-1

Fix an error when opening a new tab from terminal
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 indent to 4 spaces
update prompt colors
update fetch timeout to 1mn
update git-prompt-colors
update prompt