Use a decorator to simplify code
Moved test_socketblocker.py
Merge branch 'no_internet_for_you_fix' of github.com:astrofrog/astropy into astrofrog-no_internet_for_you_fix

Conflicts:
	astropy/tests/disable_internet.py