On Promoting Modal Shift via Generalized Ride-Sharing