urls fixed
Merge branch 'caden' into urls

Conflicts:
	astroquery/open_exoplanet_catalogue/oec_query.py