Fixed regular expression for Python 2.6
Conflicts:
	astropy/tests/pytest_plugins.py
Fix bug in Numpy <= 1.7 where unicode fill values on masked arrays are
not supported.
Add CHANGES entry.
Fixed regular expression for Python 2.6
Conflicts:
	astropy/tests/pytest_plugins.py
Fix egg_info
Upgrade py.test to 2.5.1
Upgrade to pytest-xdist 1.10
Merge branch 'misc/fix-numpy-ma-unicode-fill-value' into testing/py26-regex-fix
Make s couple of strings into unicode

Addresses #1699 but not sure this closes it.
Merge pull request #2060 from mdboom/testing/py26-regex-fix

Fix some active test suite running issues
Added check for RA with negative zero due to Longitude constructor math.
Merge pull request #2076 from pllim/vo-fix-neg-RA

Added check for RA with negative zero in Cone Search.
Merge pull request #2073 from mwcraig/fits-unicode

Make s couple of strings into unicode
Correct TCG->TDB conversion; add regression tests
Add issue number to test