Incorporate upstream 'sloLinkingFix' to change the strong preference for car links instead of walking links:
https://github.com/buma/OpenTripPlanner/compare/sloLinkingFix
Commit to set up Rebase on server.

Currently working: 
-Stops Layer: Showing bus stop locations with markers
-Vehicle Positions: Showing up to date positions of vehicles and
refreshing every 5 seconds.
-Current position marker.

Known issues: 
-Geocoder loads bus stop locations instead of addresses
-Stop id returning null in intinerary widget and when trying to load
stop view widget from itinerary
-Routebased widget returning errors
-Not able to load stop view widget from stops layer (returning as
undefined)
-Stops layer not able to load routes to display on markers
(routes[AgencyAndId].routeData returning undefined)
Update config.js
Attempting to get the geocoder back working with addresses. Added
Geocoder Server file and updated config file
Merge remote-tracking branch 'origin/mobullityrebase' into
mobullityrebase
Removing unneeded geocoder server class.. updating config.js to work
with Geocoder in it's own servlet
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
Fixed current location zoom level to initiate at a level that shows all
of USF location for when user is on a wired connection and receieves too
high of an accuracy circle.
Fixed current location zoom level to initiate at a level that shows all
of USF location for when user is on a wired connection and receieves too
high of an accuracy circle.
Merge remote-tracking branch 'origin/mobullityrebase' into mobullityrebase
Removed live map info widget