Initial work on Sidekiq 2.x and 3.x support