Add rubinius-specific dependencies to get specs running
Merge pull request #1381 from petergoldstein/feature/add_rubinius_gems

Get specs running under Rubinius
Remove branch and notifications from .travis.yml
Merge pull request #1382 from petergoldstein/feature/remove_branch_and_notifications_from_travis

Remove branches and notifications directives from .travis.yml
Revert "Raise error if we try to reconfig redis after it's been established, fixes #1309"

This reverts commit eb438ae66e92698981aef566462a667fb5e47871.
Merge branch 'master' of github.com:mperham/sidekiq
Batch expiry notes
Use a random jid when adding a job in the specs, rather than a job with a fixed jid.  Prevents duplicate members in the underlying zadd.
Update Pro-Changes.md
Merge pull request #1385 from petergoldstein/feature/fix_race_condition_in_specs

Fix race condition that caused intermittent spec failures in zadd
Update sidekiq-manager.conf

changed the example service commands as upstart uses the config file name.
Merge pull request #1388 from thilo/patch-1

Update sidekiq-manager.conf example
Only show Retry Args vertical scrollbar if needed.
Merge pull request #1389 from msmithstubbs/master

Only show Retry Args vertical scrollbar if needed.
Use Object.new for "any old object" in tests.

I don't have this project set up for testing, so I'm submitting for travis to test it for me.
Merge pull request #1390 from zenspider/patch-1

Use Object.new for "any old object" in tests.
Wrap retry arguments
Merge pull request #1392 from meltingice/1375_retry_page

Wrap retry page worker arguments
Remove the line which says that workers exit at a USR1 after stopping. This is not true and has never been the case. Use TERM for exiting after stopping with a timeout.
Merge pull request #1394 from mperham/feature/usr1-readme

Remove the line which says that workers exit at a USR1 after stopping. T...