Update setup.py and clean import for virtualenv