Fix six imports

Astroquery requires six > 1.7ish.  Astropy bundles 1.5.  See:
https://github.com/astropy/astropy/issues/2840
https://github.com/astropy/astropy/issues/2814