more use of virtualenv
Merge remote-tracking branch 'raf/master'

Conflicts:
	py/README.md