Merge branch 'master' into astropy

Staging for merge into Astropy.  This includes SVN revisions 2195:2344

Conflicts:
	MANIFEST.in
	README.txt
	docs/source/conf.py
	docs/source/developers_guide/developers_guide.rst

Conflicts:

	astropy/io/fits/__init__.py
	astropy/io/fits/card.py
	astropy/io/fits/column.py
	astropy/io/fits/convenience.py
	astropy/io/fits/core.py
	astropy/io/fits/diff.py
	astropy/io/fits/file.py
	astropy/io/fits/fitsrec.py
	astropy/io/fits/hdu/base.py
	astropy/io/fits/hdu/compressed.py
	astropy/io/fits/hdu/groups.py
	astropy/io/fits/hdu/hdulist.py
	astropy/io/fits/hdu/image.py
	astropy/io/fits/hdu/nonstandard.py
	astropy/io/fits/hdu/streaming.py
	astropy/io/fits/hdu/table.py
	astropy/io/fits/header.py
	astropy/io/fits/src/compressionmodule.c
	astropy/io/fits/tests/test_core.py
	astropy/io/fits/tests/test_diff.py
	astropy/io/fits/tests/test_image.py
	astropy/io/fits/tests/test_nonstandard.py
	astropy/io/fits/tests/test_table.py
	astropy/io/fits/tests/test_uint.py
	astropy/io/fits/util.py
	docs/io/fits/appendix/faq.rst
	docs/io/fits/appendix/history.rst
	docs/io/fits/users_guide/users_tutorial.rst
Include changelog entries for the new issues addressed in the merged changes.
This should be an AstropyPendingDeprecationWarning...
Fix for sphinx warnings
Apparently np.zeros_like doesn't take a dtype argument in Numpy 1.5
Apparently the copy method does not support an order agument in Numpy 1.5. Who knew...
Merge pull request #1676 from embray/fits-merge

Pull in latest PyFITS changes