I think you need to rebase again; there was a major change to astropy yesterday that required serious bugfixes in astroquery today