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'
Merge branch 'master' into develop

Conflicts:
	virtualenv.py
Update pip from 1.5.3 to 1.5.4
Bump version to 1.11.4
Merge branch '1.11.X'
Merge branch 'master' into develop

Conflicts:
	virtualenv.py