For Matt: Clean up inference of free-flowing intersections.

I implemented the logic that you suggested in e-mail. I added a unit test and I deleted the old inference. 

As usual, everything builds and all the tests pass.
Avi