Formatting patch.
Change order of content fields in header.

[Resolves #146]
Merge pull request #147 from joelhawksley/jh/146-header-fields-order

Jh/146 header fields order