Merge branch 'fits/astropy' into astropy

This merges up through r1927 from pyfits' trunk in SVN.  Closes the following
issues in Astropy:

Closes #339 astropy.io.fits.Header totextfile and Header.__init__ disagree on 'endcard' convention
Closes #318 Move io.fits external C dependencies into cextern

Conflicts:
	README.txt
	astropy/io/fits/src/compress.c
	astropy/io/fits/src/crc32.h
	astropy/io/fits/src/deflate.h
	astropy/io/fits/src/fits_hcompress.c
	astropy/io/fits/src/fits_hdecompress.c
	astropy/io/fits/src/fitsio.c
	astropy/io/fits/src/fitsio.h
	astropy/io/fits/src/inffast.c
	astropy/io/fits/src/inffast.h
	astropy/io/fits/src/inffixed.h
	astropy/io/fits/src/inflate.h
	astropy/io/fits/src/inftrees.c
	astropy/io/fits/src/inftrees.h
	astropy/io/fits/src/pliocomp.c
	astropy/io/fits/src/quantize.c
	astropy/io/fits/src/ricecomp.c
	astropy/io/fits/src/ricecomp.h
	astropy/io/fits/src/trees.c
	astropy/io/fits/src/trees.h
	astropy/io/fits/src/zlib.c
	astropy/io/fits/src/zlib.h
	astropy/io/fits/src/zutil.h
	cextern/cfitsio/crc32.h
	cextern/cfitsio/deflate.h
	cextern/cfitsio/fits_hcompress.c
	cextern/cfitsio/fits_hdecompress.c
	cextern/cfitsio/inffast.c
	cextern/cfitsio/inffixed.h
	cextern/cfitsio/inftrees.c
	cextern/cfitsio/pliocomp.c
	cextern/cfitsio/quantize.c
	cextern/cfitsio/ricecomp.c
	cextern/cfitsio/trees.c
	cextern/cfitsio/trees.h
	cextern/cfitsio/zutil.h
	setup.cfg
	src/crc32.h
	src/deflate.h
	src/fits_hcompress.c
	src/fits_hdecompress.c
	src/inffast.c
	src/inffixed.h
	src/inftrees.c
	src/pliocomp.c
	src/quantize.c
	src/ricecomp.c
	src/trees.c
	src/trees.h
	src/zutil.h
	tox.ini

Conflicts:

	astropy/io/fits/diff.py
	astropy/io/fits/hdu/base.py
	astropy/io/fits/hdu/compressed.py
	astropy/io/fits/hdu/image.py
	astropy/io/fits/src/compressionmodule.c
	astropy/io/fits/tests/cfitsio_verify.c
	astropy/io/fits/tests/test_core.py
	astropy/io/fits/tests/test_header.py
	astropy/io/fits/tests/test_image.py
	astropy/io/fits/tests/test_uint.py
Fixed up the astropy.fits.io package setup to support linking the compression module with a system version of CFITSIO.
This little _is_mmap hack is unnecessary in Astropy since we don't support Python 2.5.
Added all the bug fixes from the last pyfits merge to the astropy changelog.  At this point the pyfits changes kind of dominate the changelog. I hope that's okay but if not we could think of a way of collapsing it (though I'd rather not; the 'What's New' page in the docs will provide a broader overview, I think.
Merge branch 'pyfits/astropy' into astropy

This *should* fix all the issues that were causing the build to fail in

Conflicts:

	astropy/io/fits/util.py
Merge branch 'pyfits/astropy' into astropy

Conflicts:
	README.txt

Conflicts:

	astropy/io/fits/src/compressionmodule.c
Merge branch 'master' into astropy
Add the compressionmodule header.
Fix missing import
Ignore generated .pyd files.
Add some compiler flags needed to compile cfitsio in MSVC.
updated exception messages on Time initializer to be a bit more clear/explicit
added support for passing a Time object into Time initializer
added test to ensure initializer copying works
Use __new__ and replicate() to allow init with Time/TimeDelta object
Add more tests of init with Time/TimeDelta object
Merge pull request #6 from taldcroft/time-init-additions

Modified approach for time init additions
Disabling this test on Windows for now, per #507. I can confirm that it *does* pass when the test suite is run outside of Jenkins, even on the configurations where it was failing.
Fixes an annoying warning that can come from pkg_resources when running
astropy.test():

```
>>>> astropy.test()
> ^[[0;33mWARNING^[[0m: Module _pytest was already imported from
> c:\python27\lib\site-packages\astropy\extern\pytest.pyc/_pytest, but c:
> \python27\lib\site-packages\pytest-2.2.1-py2.7.egg is being added to
> sys.path [_pytest.core]
> ^[[0;33mWARNING^[[0m: Module pytest was already imported from
> c:\python27\lib\site-packages\astropy\extern\pytest.pyc/pytest, but c:\p
> ython27\lib\site-packages\pytest-2.2.1-py2.7.egg is being added to sys.path
> [_pytest.core]
> ^[[0;33mWARNING^[[0m: Module py was already imported from
> c:\python27\lib\site-packages\astropy\extern\pytest.pyc\py, but c:\python27\
> lib\site-packages\py-1.4.7-py2.7.egg is being added to sys.path
> [_pytest.core]
```

This happens if you have a package installed in site-packages, but you import it from somewhere else *before* pkg_resources is imported.  That's exactly what's happening in this case, where we're using the bundled py.test to run astropy.test().  But in the process of importing py.test, pkg_resources gets imported.

When pkg_resources is first imported it builds a "working_set" of all packages available on the path (by processing .egg-info directories).  Here's it's saying "Ah, there's a package called py.test in your site-packages, but you already have a package of the same name in your sys.modules imported from elsewhere, so I'm going to skip this one".

The fix is to simply make sure pkg_resources, if available, is imported before py.test.
Merge pull request #495 from iguananaut/fits-merge

Fits merge