Use system virtualenvwrapper
Merge branch 'master' into archlinux

Conflicts:
	bashrc