Use Python 2 /3 compatible source (no 2to3)
Remove bundled astroquery/extern/six.py
Use astropy.extern.six instead of Astroquery bundled version
Fix monkey patching of urllib in test_utils.py
Fix ImportError on Python 3
Python 3 fixes (so that it works without 2to3)
Minor Python 3 fix in splatalogue pointed out by @keflavich
Merge pull request #320 from cdeil/no_2to3

Use Python 2 /3 compatible source