A test and fix for spacetelescope/PyFITS#21

Conflicts:

	lib/pyfits/tests/test_diff.py