wip of cartodb integration
Merge branch 'cartodb' into develop
more trip improvements