Modified flight filtering rules

Flights are now included within a trip if they are within the trip or if
they overlap with the start or end of a trip.
some more
Testing modifications