Reverting merge of 1356 and subsequent fixes
Trip Ticket Expiration

* Reverting d624ec6 and fixing up failing tests
* Refactored TripTicket#expire_tickets! method and updated unit tests
* Adding trip ticket expiration default fields to provider form
* Adding expire_at field to trip tickets form
Adding default trip ticket expiration fields to ticket detail page
Merge branch 'master' of github.com:rideconnection/clearinghouse into notifications

Conflicts:
	app/models/trip_ticket.rb
unit test user notification_preferences field