Remove numpy 1.4.1 tests due to Travis segfaults
Merge pull request #803 from mdboom/vo/xmllint-broken

Raise an OSError if xmllint was terminated by the OS.
Conflicts:

	astropy/utils/misc.py
Merge pull request #781 from mdboom/utils/xml/expat-2.1.0

Upgrade expat to 2.1.0
Merge pull request #806 from mdboom/vo/validation-results-links-broken

Fix links from the VOTable validator
Merge pull request #801 from mdboom/setup/pkg-config-bugs

Improve pkg-config support
Merge pull request #817 from mdboom/coordinates/encoding

Coordinates and unicode
Merge pull request #752 from mdboom/utils/progress-bar-exception

ProgressBar(0) raises exception
Merge pull request #825 from mdboom/vo/integer-overflow

VOTable: Add a warning for integers that are out of range
Merge pull request #822 from mdboom/wcs/to_header_string_fix

WCS object from default constructor results in strange errors
Conflicts:

	astropy/wcs/tests/test_wcs.py
Merge pull request #834 from mdboom/setup/skip-hidden-files

Skip hidden files when finding `.pyx` files etc. in the source tree
Conflicts:

	astropy/utils/misc.py
	astropy/utils/tests/test_misc.py
Merge pull request #768 from adrn/name-resolve-test-fallback

Make name resolve test fallback on a cached version if web request fails
Merge pull request #836 from mdboom/unit/speed-improvement

Units: speed improvement
Merge pull request #827 from astrofrog/fix-debian-data

votable failing on accessing file outside astropy tree on stdeb debian installation
Merge pull request #838 from taldcroft/table/np-where-index

Cannot index Table with np.where output
Merge pull request #829 from taldcroft/table/bug-sort

Bug with Table sorting.  This also affected the reverse method.
Merge pull request #764 from taldcroft/table/multi-col-docs

Table: multi-column assignment fails silently.  Add documentation
to explain why this happens.
Merge pull request #841 from adrn/rsun-latex

Add latex for R_sun and L_sun, switch order with solRad
Merge pull request #813 from eteq/fix-issue-813

Minor fix needed in py.test message
Merge pull request #797 from eteq/add-install-direction-to-readme

added brief paragraph in README directing to install instructions
Merge pull request #835 from eteq/quantity-accepts-quantities

Quantity accepts quantities