Fixed Trips

Got rid of trip_leader in Trip Model because it caused context issues
with the database.