Updated docs to reflect merging into astropy