Change dominance logic to not dominate away states that have differen…

…t non-transit modes, allowing generic mode switching edges. Remove old bike-rental dominance logic. #865.

opentripplanner-routing/src/main/java/org/opentripplanner/routing/core/State.java

@@ -260,8 +260,11 @@ public boolean dominates(State other) {
         if (other.weight == 0) {
             return false;
         }
-        // Multi-state (bike rental) - no domination for different states
-        if (isBikeRenting() != other.isBikeRenting())
+
+        // Bike rental, bike parking, &c. If we have a different non-transit mode (for instance, 
+        // we've picked up a rented bike, or have parked an owned bike in a bike parking lot),
+        // don't dominate away the states at the same vertices.
+        if (!getNonTransitMode().equals(other.getNonTransitMode()))
             return false;
 
         if (backEdge != other.getBackEdge() && ((backEdge instanceof PlainStreetEdge)