change to devise
fixed new registration email
Merge branch 'develop'
syntax changes to trips_controller
removing whitespace