Merge pull request #2133 from RayPlante/doc-cython-req

added note in install docs indicating minimum cython version required
Merge pull request #2121 from cdeil/axis_order

Fix x, y order with numpy.mgrid usage
Merge pull request #2037 from eteq/fix-2037

Fix for ICRS coordinate giving RA -0 when input is 0
Merge pull request #1832 from eteq/fix-1832

Coordinates equality comparison fails for array values
Merge pull request #2146 from mdboom/votable/public-docstrings

io.votable: Add public API docstrings
Merge pull request #2144 from mdboom/misc/coding-token

Fix coding tag.
Merge pull request #2137 from mdboom/vo/float-repr

Preserve all floating-point precision when writing out a votable
Merge pull request #2132 from mdboom/testing/coverage-in-affiliated-packages

Make coverage testing work for affiliated packages
Conflicts:

	astropy/tests/helper.py
Merge pull request #2175 from bogdanni/patch-1

Use of deprecated 'key' member in error message
Merge pull request #2188 from astrofrog/changelog-0.3.2

Add CHANGES section for 0.3.2
Conflicts:

	CHANGES.rst
Merge pull request #2191 from evertrol/fix_2173

 Fix #2173: axis keyword in median_absolute_deviation.
Merge pull request #2197 from QuanTakeuchi/master

Issue with formatting coordinates with colons #2183
Conflicts:

	astropy/coordinates/tests/test_formatting.py
Merge pull request #2214 from mdboom/misc/dont-write-pyc

Don't generate .pyc files when running tests
Merge pull request #2213 from mhvk/column-no-name-header

Column with no name cannot be printed
Conflicts:

	astropy/table/tests/test_pprint.py
Merge pull request #2225 from amras1/cds-multiple-lines

Make CDS reader handle multiple description lines
Merge pull request #2208 from mdboom/test/dont-fail-if-docs-missing

Don't fail -P if docs missing
Merge pull request #2223 from mdboom/setup/make-install-without-build-work

python module not installed
Merge pull request #2221 from larrybradley/patch-1

Update docguide.rst
Merge pull request #2129 from RayPlante/vo-format-fix

vos_catalog.py: fix use of format() for compat with python 2.6
Conflicts:

	astropy/cosmology/tests/test_cosmology.py
	astropy/vo/client/vos_catalog.py
Merge pull request #2243 from pllim/changelog-for-2129

Added change log for Astropy Issue 2129