Update Sidekiq and config
Merge branch 'update-sidekiq' of git://github.com/nverba/discourse

Conflicts:
	config/initializers/sidekiq.rb