Update for astropy 0.4