@astrofrog Refactoring and adding unit tests will take time I guess ... can you make all travis builds pass for now if you install these things? Feel free to assign refactorings that are not too hard to me ... I want to use `astroquery` for my work and make it work.