Initial work on questions and payment and fix for confirmation email

app/controllers/application_controller.rb

@@ -235,7 +235,7 @@ class ApplicationController < LinguaFrancaApplicationController
 		end
 		expiry ||= (Time.now + 12.hours)
 		session[:confirm_uid] = user.id
-		UserMailer.send_mail :email_confirmation do
+		UserMailer.send_mail! :email_confirmation do
 			EmailConfirmation.create(user_id: user.id, expiry: expiry, url: url)
 		end
 	end

app/controllers/conferences_controller.rb

@@ -2109,7 +2109,15 @@ class ConferencesController < ApplicationController
 			]
 		
 		steps -= [:questions, :payment] unless status == :open
-		steps -= [:hosting] unless @registration.present? && view_context.same_city?(@registration.city, @conference.location)
+		if @registration.present?
+			if view_context.same_city?(@registration.city, @conference.location)
+				steps -= [:questions]
+			else
+				steps -= [:hosting]
+			end
+		else
+			steps -= [:hosting, :questions]
+		end
 
 		steps -= [:administration] unless @registration.present? && @conference.host?(current_user)