Merge remote-tracking branch 'origin/master' into consumers

Conflicts:
	lib/resque.rb
	lib/resque/multi_queue.rb
	test/multi_queue_test.rb
	test/test_helper.rb
	test/worker_test.rb

Author: steveklabnik

.document

@@ -0,0 +1,3 @@
+- 
+HISTORY.md
+LICENSE.txt

.gitignore

@@ -1 +1,4 @@
 Gemfile.lock
+doc/
+test/dump.rdb
+test/dump-cluster.rdb

Gemfile

@@ -2,14 +2,18 @@ source :rubygems
 
 gemspec
 
+group :development do
+  gem 'rake'
+  gem 'yard'
+end
+
+group :documentation do
+  gem 'rdoc'
+  gem 'kramdown'
+end
+
 group :test do
-  gem "rake"
   gem "rack-test", "~> 0.5"
-  gem "mocha", "~> 0.9.7"
-  gem "yajl-ruby", "~>0.8.2", :platforms => :mri
-  gem "json", "~>1.5.3", :platforms => [:jruby, :rbx]
-  gem "hoptoad_notifier"
-  gem "airbrake"
-  gem "i18n"
+  gem "json"
   gem "minitest"
 end