fixes failing email specs

Conflicts:
	app/models/user.rb

fixes missing i18n entry

fixes badly done merge

fixes i18n issues

force build to start

app/controllers/users/omniauth_callbacks_controller.rb

@@ -13,7 +13,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   end
 
   def after_sign_in_path_for(resource)
-    if resource.pending_finish_signup?
+    if resource.registering_with_oauth
       finish_signup_path
     else
       super(resource)