Don't rely on range through a map to generate a consistent order.
Merge pull request #885 from mozilla-services/smtp_header_order

Don't rely on range through a map to generate a consistent order.