Updated scripts for support of virtualenv