clean up somewhat
delete trailing dash on multiplier prefixes
move defs parsing to unitcalc.py; delay it to topo-sort the defs