Merge remote-tracking branch 'upstream/master' into amqp-configuration

Conflicts:
	sneakers.gemspec
    lib/sneakers/publisher.rb