unit: Consolidate disjointed unitOption sections in unit.Serialize
Merge pull request #68 from vcaputo/unit_serialize_consolidate_disjointed_sections

unit: Consolidate disjointed unitOption sections in unit.Serialize