Move the thomas ID correction out of just the govtrack export code and into the general data output
Merge fix