switched to custom theme
added virtualenv info to prompt
Merge branch 'master' of github.com:kraiz/dotfiles