completed trip cancel/reactivate, updated routes, added american_date to Gemfile, adjusted some basic html layouts