Fixes sidekiq:start

Sorry about the merge commit :( and that this is on master.  I am deeply ashamed.