Include wheels for virtualenv
Remove last vestiges of distribute
Merge branch 'update_virtualenv'