Merge pull request #2110 from amras1/time-docstring-formats

Documentation for time formats
Merge pull request #2368 from embray/fits-merge

Merge branch '3.2-stable' into astropy
Conflicts:

	astropy/io/fits/card.py
	astropy/io/fits/header.py
	astropy/io/fits/tests/test_checksum.py
Merge pull request #2389 from mdboom/wcs/include-files

Fix external C API for astropy.wcs
Merge pull request #2388 from embray/fix-time-doctest

Fix one of the failing tests reported in #2290
Merge pull request #2391 from mdboom/wcs/gitignore-wcslib-headers

Add a .gitignore file for the wcslib headers that are copied from `cextern/wcslib/C`
Merge pull request #2369 from hamogu/patch-3

io.ascii.ui: typo in Error mesage
Merge pull request #2398 from mdboom/coordinates/mixed-strings

Different input formats for Angle confuse unit parsing
Conflicts:

	CHANGES.rst
	astropy/coordinates/angles.py
Merge pull request #2357 from pllim/fix-xmllint-oserror

Prevent VOTable validator from crashing when xmllint encounters SIGKILL
Merge pull request #2438 from mdboom/test/turn-off-parallel-32

Turn off parallel testing on Python 3.2, where it is still occasionally flaky
Merge pull request #1836 from embray/issue-1836

param_sets method not working with SerialCompositeModel
Conflicts:

	astropy/modeling/core.py
Merge pull request #2177 from embray/fix-sip

Fix basic SIP model functionality
Conflicts:

	astropy/modeling/polynomial.py
	astropy/modeling/setup_package.py
	astropy/modeling/tests/test_polynomial.py
Merge pull request #2439 from mdboom/wcs/fix-crash

Change allocation in WCS.sub.
Merge pull request #2431 from bsipocz/fixing_failing_automodapi_test

Fixing doctest failing in construct_table.rst
Conflicts:

	docs/table/construct_table.rst
Merge pull request #2020 from mdboom/misc/jquery-extern

Change how jquery.js and jquery.dataTables.js dependencies are handled.
Merge pull request #2003 from embray/issue-2003

units: quantity bug with adding units to an array view?
Conflicts:

	astropy/units/tests/test_quantity_array_methods.py
Merge pull request #2440 from mdboom/wcs/memory-leaks

Fix memory leaks in the wcs bindings
Merge pull request #1811 from eteq/fix-missing-astropytest-ini

fix astropy.test() to run docstring tests
Conflicts:

	CHANGES.rst
	astropy/setup_helpers.py
Recify 54ed32c1c3c1e16de34a212d5621fe824746af3b which was written before 92aab898f9ea64bac1dfc64531af7346e48213e8--the __repr__ and __str__ still relied on the SIP and InverseSIP models being based on the composite model class which is no longer the case.
Fix slow down in Angle.__new__

Conflicts:

	astropy/coordinates/angles.py
Support numpy 1.5.x by making one of the tests accept TypeError or ValueError