Don't use column p_rout_id for anything but join conditions
Rename sample data files to correctly reflect the Powerrouter version
Increase maximum number of points in diagrams