Updated pip configuration layout in common

This commit changes how basic pip configuration is layed down and
incorporates changes made bt @nrb in commit d232585a062803c7033ab4dff482eec572dbd740.