Merge pull request #1076 from iguananaut/fits-merge

Merge branch 'pyfits/astropy' into astropy
Conflicts:

	CHANGES.rst
	astropy/io/fits/tests/test_image.py
	astropy/io/fits/tests/test_table.py