modify for cleaned up install process in virtualenv_cleanup branch
resolve conflict in provision_crosscat.sh