Merge pull request #198 from emilyhahn/test_branch

CIDEVMI-1328 telemetered / recovered combined with same parser
added units of measure abbreviation strings
Merge pull request #204 from danmergens/unit_fix

added units of measure abbreviation strings
Merge branch 'mflm_ctdmo', remote branch 'upstream/master' into mflm_ctdmo