Adds trips and trip stops
Merge branch 'master' of https://github.com/fluxusfrequency/beer-hackfest