Ensure that an option is returned from tripshape lookups on trips without tripshapes
Merge pull request #493 from moradology/feature/tripshape-option

Ensure that an option is returned from tripshape lookups