update help to make Package Index Options' usage clearer, ref #1814
Optional finder variable must be validated before use
detect windows when running under IronPython
fixed windows test
Replaces spaces in username.

Conflicts:
	pip/locations.py
Merge pull request #1897 from paweljasinski/ironpython

detect windows when running under IronPython
Merge pull request #1815 from pcx/develop

update help to make Package Index Options' usage clearer, ref #1814
Fix to add a missed/new windows compat location
Merge pull request #2004 from dstufft/use-windows-compat-check

Fix to add a missed/new windows compat location
Test that parse_requirements does not require a finder
Merge pull request #2005 from dstufft/pr-1959

Continue PR #1959
Upgrade six to 1.7.3
Fixing issues with install's --target option.

 1. Check for the existence of a directory before copying from temporary directory to final target. If it exists, warn the user.
 2. If the user specifies the --upgrade option and the directory exists, delete it and continue with installation.
 3. Adding tests for above cases.

This resolves #1489, #1710 completely and parts of #1833.
Fixing pep8 errors
Merge pull request #2006 from dstufft/upgrade-six

Upgrade six to 1.7.3
Covering case of single-module packages.

Behavior is now to overwrite files or folders if --upgrade is specified, however, links will not be overwritten.
Fix --no-cache-dir
Merge pull request #2010 from dstufft/fix-no-cache

Fix --no-cache-dir
Acceptance test for unicode log fix
Allows native_str() to optionally ignore errors