Committing so can do a merge from develop to pick up Derek's
latest changes, rather than trying to fix something I think he
has already fixed.
Merge branch 'develop' into localization-52395183
Add factories to watch list for Guard; fix test for durations to
handle the conversion to seconds (from ms); fix factory to always
use a future date.
Add itinerary methods (and tests) to Trip.
Better error messages when no valid itineraries.
Use ACTION_ICONS for consistent icons, fix up itinerary summary view
to use model methods.
Add .tags* files to .gitignore.
Fix typo in home_controller.
Fix localization specs.
There is no index action any more for trips, at the moment.
Fix locale on itinerary_spec (but it's not done in quite the right
way, left a TODO in there).
Mostly localization; also removed some unused actions in
trips_controller.
Remainder of localization.
Merge branch 'localization-52395183' into develop [Fixes #52395183]