Refactor astropy.units to use six instead of 2to3
Encode signatures as byte strings
Fixups after rebase