Fix initialisation order bug with units() and replace std::pair with make_pair.
Merge pull request #69 from danielhams/dhdevelop

Init order bug fix to units and code standardisation fix