Merge pull request #2412 from eteq/fix-google-data-test

change remote data tests to use astropy site instead of google
Merge pull request #2405 from embray/fix-disable-internet-test

Fixes several of the remote-data tests mentioned in #2290
Conflicts:

	astropy/tests/disable_internet.py
	astropy/tests/tests/test_socketblocker.py
	astropy/vo/client/tests/test_vo.py