Update to show virtualenv and remove unnecessary stuff
Merge branch 'master' of github.com:ivanlei/dotfiles