Merge pull request #1715 from mdboom/unit/low-hanging-fruit

Low hanging optimizations in units and coordinates
Merge pull request #1771 from mdboom/docs/doctest-pytest

Run doctests in .rst files
Merge pull request #1814 from embray/astropy.test-issues

Fix some minor issues with astropy.test()
Merge pull request #1809 from mdboom/vo/empty-fields

How to use ``astropy.io.votable`` to fix non standard-compliant tables?
Conflicts:

	CHANGES.rst
Merge pull request #1732 from mhvk/time-fromepoch-scale-conversion

Time fromepoch scale conversion (closes #1122); TimePlotDate correction
Merge pull request #1496 from astrofrog/clarify-eterms

E-term calculation uses equinox but should use observation date
Merge pull request #1853 from astrofrog/mageia-known-issue

Mageia known issue
Merge pull request #1843 from astrofrog/disable-remote-doctest

Skip doctests that require a remote server
Merge pull request #1845 from mdboom/wcs/hide-warning-in-printwcs

Remove spurious warning from printwcs
Conflicts:

	CHANGES.rst
Merge pull request #1824 from cdeil/stats_docstrings

Fix some typos in stats docs
Merge pull request #1772 from embray/quantity-formatting-nit

Minor repr() and str() formatting tweak for dimensionless Quantities
Merge pull request #1856 from mdboom/docs/fix-doctests-quantity-spaces

Is doctest ELLIPSES not on by default any more?
Merge pull request #1855 from mdboom/testing/ignore-endianness

Ignore the endianess markers in Numpy dtype strings
Merge pull request #1830 from astrofrog/issue-1830

Modeling test failure on MacOS X
Merge pull request #1471 from astrofrog/issue-1471

MaskedColumn finalize not giving expected results
Conflicts:

	astropy/table/column.py
Merge pull request #1775 from mhvk/quantity-speedup

Speed-up of quantity initialisation
Merge pull request #1861 from mdboom/wcs/add-list-of-projections

Add list of supported projections to WCS docs
Merge pull request #1854 from mdboom/wcs/fixing

Issues with WCS fixing
Conflicts:

	CHANGES.rst
Merge pull request #1867 from mdboom/table/sort

Table sort fails for unicode fields in numpy 1.5
Conflicts:

	CHANGES.rst
Merge pull request #1874 from taldcroft/table/orphaned-code

Remove some orphaned code in Table.groups