Merge OSEM updates

config/environments/development.rb

@@ -113,5 +113,5 @@ Osem::Application.configure do
       devise_config.ichain_test_mode = true
     end
   end
-
+  config.active_record.verbose_query_logs = true
 end

config/environments/production.rb

@@ -97,7 +97,7 @@ Osem::Application.configure do
     domain:               ENV['OSEM_SMTP_DOMAIN'],
     enable_starttls_auto: ENV['OSEM_SMTP_ENABLE_STARTTLS_AUTO'],
     openssl_verify_mode:  ENV['OSEM_SMTP_OPENSSL_VERIFY_MODE']
-  }
+  }.compact
 
   # Set the secret_key_base from the env, if not set by any other means
   config.secret_key_base ||= ENV["SECRET_KEY_BASE"]