Lots of bits and pieces as a result of ticket TAO-16.
Merge branch 'zen' of https://github.com/IntersectAustralia/asvo-tao into zen
Fixed a little h problem with the SFH code.

Ticket reference: TAO-16