Fix current_trip

This should fix the functionality on the edit trips page. Tests needs be written for the edit_trips view still. You'll noticed I left some pending specs for the trips_controller. I am still debating on whether to use Cucumber to test that functionality or to use RSpec. Either way, we can decide as we refactor our  tests more.