formatting fixes
Merge branch 'docs_xmatch' of github.com:keflavich/astroquery into keflavich-docs_xmatch

Conflicts:
	docs/xmatch/xmatch.rst
Merge branch 'keflavich-docs_xmatch' into docs/xmatch