Bring in the branch of setuptools that uses packaging as well