New format for trips which removes redundant city names by creating an
array of trips for each two cities.
Merge branch 'master' of https://github.com/mre/trips