Reorganize model
Small controller adjustments
Refactor RSpec tests
Rename trip_name to name
Fix conflicts
Make the tests green
Merge pull request #113 from tuxedio/c-refactor-trips

Refactor trips