some fixes to the waypoint generator
add two-robot spec with deadlock