Just remove the pip/virtualenv for this PR and I'll merge this one..