Allow for automatic finding of pip/pip-python

Change-Id: I4dd9d5a3902294414a3985236097a13bb2818db1