Fix PEP8 issue
Use make-includes code to create virtualenv