Now that pytest is invoked via setup.py, it should no longer be necessary to continue to support running tests via setup.py test.

Conflicts:
	.hgtags
	CHANGES.txt
	ez_setup.py
	setuptools.egg-info/requires.txt
	setuptools/version.py

Fix #277, data files in symbol link directory are not included issue

--HG--
branch : bugfix-277

Declare argtypes and restype on SetFileAttributesW so that it will cast Python 2 bytestrings to Unicode automatically.

This makes it so that these eggs don't prevent `install_requires` from
installing these packages.

Fixes ticket #80; workaround for ticket #209

--HG--
branch : put_setup_requires_egg_in_cache_dir_4

--HG--
branch : BB-270_fix_VersionConflict_test_failure_2

This allows you to specify args on the tox command line that get passed through
to py.test -- e.g.:

tox -e py27 -- -k testResolve --tb=short setuptools/tests

Adding 'bootstrap.py' for bootstrapping a development environment when setuptools metadata isn't already present. Fixes #278.