Use before filters in trips controller; some formatting tweaking.
Commit WIP on return trips before doing some more radical formatting.
Formatting is pretty good, behavior at end of trip planning still needs to be finished.