astropy 0.2.1 -> astropy-dev
Merge branch 'bugfixes' of github.com:keflavich/astroquery into bugfixes

Conflicts:
	.travis.yml