* Update to rust 1.40.0 * fixups
* Towards accounting for all tokens * Move 5m tokens back into the big pool * Flesh out batch 4 * Add a script to generate ValidatorInfo structs from a CSV file * Remove commented out code and improve test