Update astropy.constants to use six rather than 2to3
Merge pull request #1512 from mdboom/constants/six

Update astropy.constants to use six rather than 2to3