added support for python virtualenv
Fix a bug in line jump in git directory.
Merge branch 'master' of https://github.com/flepied/liquidprompt into develop
move virtual env function in the path section, move the display from the front to the path section of the prompt, inside brackets, add flepied as an author, update the readme
fix issue #74 by adding an example bashrc
Merge branch 'master' of https://github.com/jorisv/liquidprompt into develop
Merge branch 'fix_git_basename' of https://github.com/dr4Ke/liquidprompt into develop

Conflicts:
	liquidprompt
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	liquidprompt