Remove bundled astroquery/extern/six.py
Use astropy.extern.six instead of Astroquery bundled version
Fix monkey patching of urllib in test_utils.py