switched install to astropy 2rc1
Merge remote-tracking branch 'upstream/master'
added multiquery simbad example
added mirror choice in simbad
switched install to astropy 2rc1
yay!  multiquery works
attempted to add default BasicQuery for multiqueries, but I don't
understand the simbad API well enough to do thsi
address issue #54 - import bs4 in function
import fix (included in the "wrong" branch b/c trivial)
import fix.  Need to find out where the lack-of-import happend... I
suspect branch conflicts
Merge pull request #57 from keflavich/nist-bs4-fix

NIST bs4 import fix + travis fixes: merging despite incomplete travis build because other travis tests (see PR #53) depend on this.
added multiquery simbad example
added mirror choice in simbad
yay!  multiquery works
attempted to add default BasicQuery for multiqueries, but I don't
understand the simbad API well enough to do thsi
Merge branch 'simbad-doc' of github.com:keflavich/astrodata into simbad-doc
fix to the IRSA test, again.  Seriously?
no python 3.2!  python 3.2 fails on some of the required packages.
Obviously we need to refactor to depend on astropy.coords instead of
coords 0.37, but still....
removed IRSA test.... the errors were just getting silly
Merge pull request #56 from keflavich/simbad-doc

SIMBAD fixes & docs