* Update the `convert-nei-dump` script to avoid overwriting an `mod-version.cg` file and to only add those items which are missing
* Fix the reformat script to work with recent changes * Fix the convert-nei-dump script to remove leading and trailing '_' * Fix various broken tests