Use six for astropy.cosmology
Merge pull request #1890 from mdboom/cosmology/six

Use six for astropy.cosmology