Refactor astropy.units to use six instead of 2to3
Encode signatures as byte strings
Fixups after rebase
Fixup after rebase
Merge pull request #1459 from mdboom/unit/six

Refactor astropy.units to use six instead of 2to3