Upgrade pip to 1.5.2
Update changelog
Bump version
Merge branch '1.11.X'
Merge branch 'master' into develop

Conflicts:
	virtualenv.py
Fix long_description

Includes the right half of docs/index.rst (the one with links instead of the one with a `.. toctree:` directive).

Fixes the embarrassing unformatted PyPI page.  I'd appreciate a 'setup.py register', or a manual PyPI description update, because seeing unformatted PyPI
pages causes me pain in the aesthetic gland.
Merge pull request #559 from mgedmin/patch-1

Fix long_description
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
Protect registry calls with try...except so that not having an installed Python isn't an error
Merge pull request #579 from pfmoore/registry-optional

Protect registry calls with try...except so that not having an installed...