fixed deploy for heroku

(cherry picked from commit 826e3a5e294d3828e5529cb5da725edb4c64557a)
Added small support for trips
Just wanted to add the delay
Merge branch 'master' into trips