Merge pip helper and manager
Some fixes in pip package manager