Make sure journey JSON always includes waypoints

One alternate idea is to have a class attribute on the `Journey` model specifying which non-column attributes should be recursively `to_json()`'d.