Merge branch 'pyfits/astropy' into astropy

Merges up through r2181 from pyfits' SVN (still need to update the
astropy changelog with the relevant changes as well).

Conflicts:
	setup.cfg
	setup.py
	tox.ini

Conflicts:

	.gitignore
	astropy/io/fits/__init__.py
	astropy/io/fits/_release.py
	astropy/io/fits/column.py
	astropy/io/fits/core.py
	astropy/io/fits/file.py
	astropy/io/fits/fitsrec.py
	astropy/io/fits/hdu/compressed.py
	astropy/io/fits/hdu/groups.py
	astropy/io/fits/hdu/nonstandard.py
	astropy/io/fits/hdu/table.py
	astropy/io/fits/scripts/fitscheck.py
	astropy/io/fits/src/compressionmodule.c
	astropy/io/fits/tests/__init__.py
	astropy/io/fits/tests/test_checksum.py
	astropy/io/fits/tests/test_core.py
	astropy/io/fits/tests/test_diff.py
	astropy/io/fits/tests/test_division.py
	astropy/io/fits/tests/test_groups.py
	astropy/io/fits/tests/test_hdulist.py
	astropy/io/fits/tests/test_header.py
	astropy/io/fits/tests/test_image.py
	astropy/io/fits/tests/test_nonstandard.py
	astropy/io/fits/tests/test_structured.py
	astropy/io/fits/tests/test_table.py
	astropy/io/fits/tests/test_uint.py
	astropy/io/fits/tests/test_util.py
	astropy/io/fits/tests/util.py
	astropy/io/fits/util.py
	docs/fits/api_docs/api_cards.rst
	docs/fits/api_docs/api_diff.rst
	docs/fits/api_docs/api_files.rst
	docs/fits/api_docs/api_hdulists.rst
	docs/fits/api_docs/api_hdus.rst
	docs/fits/api_docs/api_headers.rst
	docs/fits/api_docs/api_images.rst
	docs/fits/api_docs/api_tables.rst
	docs/fits/api_docs/api_verification.rst
	docs/fits/users_guide/users_headers.rst
	docs/fits/users_guide/users_image.rst
	docs/fits/users_guide/users_misc.rst
	docs/fits/users_guide/users_reference.rst
	docs/fits/users_guide/users_scripts.rst
	docs/fits/users_guide/users_table.rst
	docs/fits/users_guide/users_tutorial.rst
	docs/fits/users_guide/users_unfamiliar.rst
	docs/fits/users_guide/users_verification.rst
	docs/io/fits/api/cards.rst
	docs/io/fits/api/diff.rst
	docs/io/fits/api/files.rst
	docs/io/fits/api/hdulists.rst
	docs/io/fits/api/hdus.rst
	docs/io/fits/api/headers.rst
	docs/io/fits/api/images.rst
	docs/io/fits/api/tables.rst
	docs/io/fits/api/verification.rst
	docs/io/fits/api_docs/api_cards.rst
	docs/io/fits/api_docs/api_diff.rst
	docs/io/fits/api_docs/api_docs.rst
	docs/io/fits/api_docs/api_files.rst
	docs/io/fits/api_docs/api_hdulists.rst
	docs/io/fits/api_docs/api_hdus.rst
	docs/io/fits/api_docs/api_headers.rst
	docs/io/fits/api_docs/api_images.rst
	docs/io/fits/api_docs/api_tables.rst
	docs/io/fits/api_docs/api_verification.rst
	docs/io/fits/appendix/appendix.rst
	docs/io/fits/index.rst
	docs/io/fits/usage/examples.rst
	docs/io/fits/usage/headers.rst
	docs/io/fits/usage/image.rst
	docs/io/fits/usage/misc.rst
	docs/io/fits/usage/scripts.rst
	docs/io/fits/usage/table.rst
	docs/io/fits/usage/unfamiliar.rst
	docs/io/fits/usage/verification.rst
	docs/io/fits/users_guide/users_guide.rst
	docs/io/fits/users_guide/users_headers.rst
	docs/io/fits/users_guide/users_image.rst
	docs/io/fits/users_guide/users_intro.rst
	docs/io/fits/users_guide/users_misc.rst
	docs/io/fits/users_guide/users_reference.rst
	docs/io/fits/users_guide/users_scripts.rst
	docs/io/fits/users_guide/users_table.rst
	docs/io/fits/users_guide/users_tutorial.rst
	docs/io/fits/users_guide/users_unfamiliar.rst
	docs/io/fits/users_guide/users_verification.rst
A couple Python 3 syntax repairs
Documentation tweaks in automodapi
Fix the :skip: option of automodapi to not generate skipped function/class docs

Closes #983
Fixed a typo in the pyfits changelog that was causing a warning in the sphinx build
Adds a 'known issue' for the .astropy permissions issue.  Fixes #988.
Fix incomplete sentence.
Fix compatibility with Numpy 1.4.1
Fix pytest imports
Merge pull request #988 from iguananaut/issue-988

Add a 'Known issue' for .astropy permissions
Merge pull request #1088 from eteq/issue-983

Fix automodapi :skip: directive
Merge pull request #1089 from astrofrog/nddata/fix-allclose-import

Fix compatibility with Numpy 1.4.1
Merge pull request #1090 from astrofrog/fix-pytest-imports

Fix pytest imports
Add the changelog entries for all the fixes/changes included in this merge.
Merge pull request #1076 from iguananaut/fits-merge

Merge branch 'pyfits/astropy' into astropy