urls fixed
Merge branch 'caden' into urls

Conflicts:
	astroquery/open_exoplanet_catalogue/oec_query.py
Merge branch 'open_exoplanet_catalogue' of https://github.com/CadenArmstrong/astroquery into open_exoplanet_catalogue

Conflicts:
	astroquery/open_exoplanet_catalogue/oec_query.py
Fixed monkey patch methods of local tests