Fix drink column names
Fix deprecated things
Remove deprecated config.active_record.auto_explain_threshold_in_seconds
Remove money-rails and use decimal for amounts
Merge remote-tracking branch 'origin/mxey-cleanup'

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/drinks_controller.rb
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/drinks/_form.html.haml
	app/views/drinks/index.html.haml
	app/views/drinks/show.html.haml
	app/views/users/show.html.haml
	db/schema.rb