Merge pull request #45 from sensu/fix/server-fails-without-client-config

Fix crash in sensu-server when client default settings are not present

lib/sensu/settings/loader.rb

@@ -174,6 +174,7 @@ def load_directory(directory)
       # * Ensuring client subscriptions include a single subscription based on the
       # client name, e.g "client:i-424242".
       def load_client_overrides
+        @settings[:client] ||= {}
         @settings[:client][:subscriptions] ||= []
         @settings[:client][:subscriptions] << "client:#{@settings[:client][:name]}"
         @settings[:client][:subscriptions].uniq!
@@ -183,7 +184,7 @@ def load_client_overrides
       # Load overrides, i.e. settings which should always be present.
       # Examples include client settings overrides which ensure a per-client subscription.
       def load_overrides!
-        load_client_overrides
+        load_client_overrides if ["client", "rspec"].include?(sensu_service_name)
       end
 
       # Set Sensu settings related environment variables. This method