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...
Fix layout of the retry all checkbox
Merge pull request #1395 from bradleypriest/checkbox

Fix layout of the retry all checkbox
Bump redis, changes
Expose delay as sidekiq_delay also, fixes #1393
latest pro
Allow Sidekiq::Stats#reset to reset individual stats independently
Merge pull request #1402 from bwthomas/20131218_reset_individual_stats

Allow Sidekiq::Stats#reset to reset individual stats independently
Batch progress bar, fixes #1398
@in_progress got cleared in #requeue but was being logged after the requeue. Also, removing redundant log statement.
Merge pull request #1407 from mperham/feature/fix-logging

@in_progress got cleared in #requeue but was being logged after the requ...