Merge branch 'adam-steel'
Declares ruby version
Merge branch 'setting-up-friendly-id' into adam-steel
Merge branch 'adam-steel'
Deletes errant trips migration.

Migration removed a column that was created in a now non-existent
migration.
Refactors order_items. Updates @trip_dates query.
Renames controller.
Merge branch 'setting-up-friendly-id' into adam-steel
Merge branch 'adam-steel'
Merge branch 'master' into adam-steel