Rework documentation of setuptools and pip
Merge branch 'master' of github.com:mandarg/python-guide

Conflicts:
	docs/starting/install/osx.rst