Ok very last edit to get pip working
Merge branch 'fix_pip_installed_packages'