Added a class UnitScaleError to catch errors arising due to scale, and added a test
bringing master back to intial state.
reverting back changes
reverting back changes
Trying to make a merge
Ignore differences between 32-bit and 64-bit ints
Merge branch 'master' of https://github.com/astropy/astropy

Conflicts:
	astropy/io/fits/tests/test_connect.py
Fix equality for array coordinates

Closes #1832
Added test for #1832 failure mode
Add test for #2037 failure mode
update changelog
Get `Longitude` sign to come out right from `wrap_angle` when 0

Closes #2037
Fix test that incorrectly had '-0h00m00s 0d00m00s' and similar
Merge branch 'master' of https://github.com/astropy/astropy
Fixed tes_connect.py for master
Fixed catch_warnings
formstting changes
Ignore long int suffix in doctests, e.g. 1234L
Make astropy.io.registry and astropy.io.misc compatible with Python 2 and 3 using six
Avoid double copy of data in registry