Cleaned up trip events
Merge branch 'develop' of https://github.com/mojio/Mojio.Client into develop