removed console.logs in js, refactored TripsController#show to access errands in view
resolved merge conflict
fixed bug in Trip#show to properly render errands
Merge pull request #38 from LightningLord/trip_tdd

removed console.logs in js, refactored TripsController#show to access er...