Merge pull request #23 from mnfienen/classy

Fixed a bug in make_rivers_table in creating ordered FIDs
Merge remote-tracking branch 'upstream/classy' into classy