Schema changes for Rails 4
Add initial tests for api/trips
Fix deprecation warning and fix bug in current_user