Merge pull request #79 from jorisv/master

No line return in a git repository
Merge branch 'master' of ssh://localhost:8480/nojhan/liquidprompt
Merge branch 'develop'
solve a remaining merge conflict in the readme
Note about PROMPT_COMMAND
Merge branch 'master' of github.com:nojhan/liquidprompt
Display a yellow + if stashs

Add a yellow + after the git infos, if there is at least one stash.
The * in case of untracked file is now red.
Correction 'update_terminal_cwd error' on Mac OSX (Mountain) Lion systems
Merge branch 'develop' of github.com:nojhan/liquidprompt into develop
Merge branch 'master' of https://github.com/dloureiro/liquidprompt into develop