Fixed a bug in make_rivers_table in creating ordered FIDs

Also updated CleanupRiverCells.py so it works with XML input file