took out unnecessary logic and changed specs and view to match
Merge branch 'master' into refactor_trips_controller_show
Merge pull request #145 from LightningLord/refactor_trips_controller_show

Refactor trips controller show