Add validations and flash messages to User and Trips controllers

Add validations and flash messages to User and Trips controllers
Many merge conflicts.  I believe they have all been resolved.