Use major.minor format in the version string of the sphinx configuration file
Printing units too, when printing the table.
raised exception in case scale mismatches
time-no-scale-init
Printing tables shows units, by default, if present.
Changed show_unit=None and updated docstring.
added internet prevention tool from astroquery
added documentation, cleanup from affiliated->master package
Added a test for time-no-scale-init
Changes made for scale-uni-init error message
Added a change for bug not showing a useful message in TimeFromEpoch scale conversion failure
no need to overload when it's defined in this package...
rearranged testing tools to allow localhost connections.  Makes the code
more complicated, but I guess also more useful.  Need to repair the
turn_internet_on code now
turn_internet_on rebuilt; still not necessary though
PEP8 changes for test_basic.py
PEP8 changes for core.py
fixedtest_basic
PEP8 fixes
Merge branch '3.2-stable' into astropy

Conflicts:
	.coveragerc
	.travis.yml
	MANIFEST.in
	docs/io/fits/users_guide/users_headers.rst
	docs/source/appendix/header_transition.rst
	docs/source/conf.py
	docs/source/developers_guide/developers_guide.rst
	setup.cfg

Conflicts:

	astropy/io/fits/card.py
	astropy/io/fits/column.py
	astropy/io/fits/convenience.py
	astropy/io/fits/core.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/image.py
	astropy/io/fits/hdu/table.py
	astropy/io/fits/header.py
	astropy/io/fits/scripts/fitscheck.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_header.py
	astropy/io/fits/util.py
	docs/io/fits/usage/headers.rst
	docs/io/fits/usage/image.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_intro.rst
	docs/io/fits/users_guide/users_tutorial.rst
Update deprecated decorators in astropy.io.fits to refer to the corresponding *astropy* version in which those interfaces are deprecated (some of them have been ever since 0.1) rather than the PyFITS version, which was no doubt confusing...