Merge pull request #1 from bliksemlabs/origin

Update with MareyView
some housekeeping
Merge remote-tracking branch 'origin/origin' into origin
Migrate Trips to VehicleJourneys