replace ``setup.py develop`` by ``python setup.py develop`` in the
development workflow document
Fix some typos in documentation

Conflicts:
	docs/convolution/index.rst
	docs/convolution/using.rst
	docs/coordinates/angles.rst
	docs/coordinates/distances.rst
	docs/coordinates/index.rst
	docs/coordinates/sgr-example.rst
	docs/development/docguide.rst
	docs/development/docrules.rst
	docs/development/testguide.rst
	docs/io/ascii/read.rst
	docs/io/ascii/write.rst
	docs/modeling/index.rst
	docs/modeling/models.rst
	docs/modeling/new.rst
	docs/units/equivalencies.rst
	docs/units/quantity.rst
Fix more one-letter typos

Conflicts:
	docs/convolution/kernels.rst
	docs/coordinates/distances.rst
	docs/development/testguide.rst
	docs/io/unified.rst
Only install the header files that are actually part of the C API
Merge pull request #1666 from mdboom/wcs/dont-include-non-api-headers-02x

wcs: only install headers that are part of the C API
Merge pull request #1516 from migueldvb/v0.2.5

Fix documentation typos for v0.2.5
Merge pull request #1429 from mdboom/misc/unicode-minus

Parsing signs in Angle
Conflicts:

	astropy/coordinates/angle_lextab.py
	astropy/units/format/unicode_format.py
Merge pull request #879 from astrofrog/fix-numpy14-failure

test_new_masked_col_existing_table needs to be skipped when Numpy 1.4.1 is used
Merge pull request #1477 from eteq/fix-config-test-writing

stop the config tests from generating a configuration section in the astropy.cfg file
Merge pull request #828 from astrofrog/table-disallow-inequality-comparisons

Table > value should not work
Conflicts:

	astropy/table/table.py
	astropy/table/tests/test_table.py
Merge pull request #1518 from astrofrog/fix-exception-handling

Avoid errors in cases where ``traceback`` is None
Merge pull request #1530 from mdboom/tests/encoding-is-none

py.test cannot run if sys.stdout.encoding is None
Conflicts:

	astropy/tests/pytest_plugins.py
Added changelog entries for fixes newly backported to 0.2.5
this test should be expected to fail on Numpy < 1.5; not going to worry right now about tests failing on 1.8rc
Preparing release 0.2.5
Back to development: 0.2.6