skip specific unicode test on win/py3
docs and cli error text updates
test fix in response to change in error text
Merge https://github.com/pypa/pip into develop
added exception handling in case of wrong pypirc file format