load oauth_keys.yml.example as default so I don't have to touch my...

load oauth_keys.yml.example as default so I don't have to touch my oauth_keys.yml to have the specs pass on my machine

config/initializers/_before_load_services.rb

@@ -11,9 +11,8 @@ oauth_keys_file = "#{Rails.root}/config/oauth_keys.yml"
 
 SERVICES = nil
 silence_warnings do
+  SERVICES = load_config_yaml("#{oauth_keys_file}.example")
   if File.exist? oauth_keys_file
-    SERVICES = load_config_yaml(oauth_keys_file)
-  else
-    SERVICES = load_config_yaml("#{oauth_keys_file}.example")
+    SERVICES.deep_merge(load_config_yaml(oauth_keys_file))
   end
-end
\ No newline at end of file
+end