.
Cleaner stuffing of bits
Undo merge screwiness
Undo changes to MatrixToImageWriter.  AztecWriter can do scaling.