Backport enqueue_at_with_queue
Commenting out some ancient redis server option

that was causing the tests to explode, as the server was never starting.
I could also do this by finding out whatever ancient redis version
accepts this and using it locally instead, but...  don't wanna.
Bumping version and updating Gemfile.lock
Cleaning up the previous run's redis db dump

to avoid fantastic segfaults caused by trying to remove it within the
`at_exit` block.

Also wrapped a pretzel block with parens to calm down whatever linting
thing happens in vim.
Making sure this template works on 1.8.7

by converting symbols to strings before sorting them, as 1.8.7's
`Symbol` does not implement `<=>`.
Merge pull request #236 from modcloth-labs/getting-tests-working-on-v1.9-stable

Getting tests working on v1.9 stable
Merge pull request #143 from dplummer/v1.9-stable

Backport enqueue_at_with_queue
Trailing whitespace stripping (and nothing else)
Backport facilities from master.
Avoid Resque 1.25.0 or higher.

Resque 1.25.0 introduced a breaking API change. Fixes #258.
Merge pull request #259 from tamird/v1.9-stable

Avoid Resque 1.25.0 or higher.
Backporting the Travis config in prep for 1.9.10 release
Updating the history file in prep for the 1.9.10 release
Installing json gem for ruby < 1.9
Merge pull request #260 from meatballhat/1.9.10-release-prep

1.9.10 release prep
Merge remote-tracking branch 'upstream/v1.9-stable' into merging-v1.9-stable

Conflicts:
	.gitignore
	HISTORY.md
	lib/resque/scheduler.rb
	lib/resque_scheduler.rb
	lib/resque_scheduler/server.rb
	lib/resque_scheduler/version.rb
	resque-scheduler.gemspec
	test/delayed_queue_test.rb
	test/redis-test.conf
	test/scheduler_test.rb
	test/test_helper.rb
Merge pull request #261 from meatballhat/merging-v1.9-stable

Merging v1.9 stable