played with conda virtual env in prompt
Merge branch 'master' of github.com:davevangoor/dotfiles

Conflicts:
	bashrc