Using $VIRTUAL_ENV to set virtualenv prompt
Merge pull request #187 from manojlds/virtualenvprompt

Using $VIRTUAL_ENV to set virtualenv prompt
Merge remote-tracking branch 'revans/master' into develop

* revans/master:
  Using $VIRTUAL_ENV to set virtualenv prompt
Merge branch 'develop'

* develop:
  Using $VIRTUAL_ENV to set virtualenv prompt