TripIt looks good. You email bookings and schedules to a common email address and it works out what you are doing. I might try doing my Zermatt trip on it retrospectively to see how good it is at non-standard stuff.