Further cleanups, prepare to cache trips
Add trip cache
Integrate with wercker