Add a virtualenv flag to the prompt
Merge branch 'master' of github.com:bordercore/dotfiles