Merge in Sam's changes from pophealth/hqmf2js