Merge updated to pip and setuptools