Upgrade to pip 1.5.3
Bump setuptools version to 2.2
Update the bundled pip to the correct 1.5.3
Bump version and update changelog
Merge branch '1.11.X'