Enhancements to virtualenv
