Merge pull request #752 from tshepang/master

give virtualenv directory a more generic name