Incorporate upstream 'sloLinkingFix' to change the strong preference for car links instead of walking links:
https://github.com/buma/OpenTripPlanner/compare/sloLinkingFix
Merge branch 'bike-linking-fix' of
https://github.com/jmfield2/usf-mobullity into jmfield2-bike-linking-fix

Conflicts:
	src/main/java/org/opentripplanner/routing/impl/CandidateEdge.java
	src/main/java/org/opentripplanner/routing/impl/CandidateEdgeBundle.java
	src/main/java/org/opentripplanner/routing/impl/StreetVertexIndexServiceImpl.java
updated geocoder link to work with standalone geocoder on server
Merge branch 'jmfield2-bike-linking-fix' into mobullityrebase