Merge pull request #380 from joshcooper/patch-1

Properly merge command-line exclusions with default :if and :unless.

lib/rspec/core/configuration_options.rb

@@ -16,6 +16,7 @@ def configure(config)
         keys.unshift(:requires) if keys.delete(:requires)
         keys.unshift(:libs)     if keys.delete(:libs)
         formatters = options[:formatters] if keys.delete(:formatters)
+        config.exclusion_filter.merge! options[:exclusion_filter] if keys.delete(:exclusion_filter)
         keys.each do |key|
           config.send("#{key}=", options[key]) if config.respond_to?("#{key}=")
         end