After conferring with Jeff, I removed the walk time and transfers. We could add back in walk time and remove book ahead?
Merge remote-tracking branch 'origin/develop' into HEAD
updated styles on walking directions to not be A) short or B) cut off.
ecolane
Merge remote-tracking branch 'origin/develop' into HEAD
Display ecolane results
override non-kiosk walk partial
Merge pull request #149 from CG-CamSys/284-walking-details-cutoff

updated styles on walking directions to not be A) short or B) cut off.
Merge remote-tracking branch 'origin/develop' into 148-ecolane
Merge remote-tracking branch 'origin/develop' into 274_trip_cards_update
Merge pull request #141 from CG-CamSys/274_trip_cards_update

Trip View Summary - removed excess info.
Merge remote-tracking branch 'origin/develop' into 148-ecolane
Try preloading the constant so it doesn't have issues loading later on
update copy
Adjustments to booking button
Merge pull request #153 from CG-CamSys/148-ecolane

148 ecolane
Merge remote-tracking branch 'origin/develop' into 276-minor-copy-edits
Merge pull request #155 from CG-CamSys/276-minor-copy-edits

update copy
Merge remote-tracking branch 'origin/develop' into 151-hook-up-email-provider-button-and-small-design-tweaks

Conflicts:
	app/views/kiosk/trips/show.html.haml