Astropy version updates

Incorporate changes needed for astropy version update