Cleaning up formatting.
Updating readme to reference hamt+
Backporting some code cleanup work from HAMT+