Merge pull request #1034 from flamholz/master

Factor out calculation of traversal cost into its own class
clean up some code in PlainStreetEdge.java
Merge remote-tracking branch 'upstream/master'