Redis: Use super._restore when ack_emulation disabled.  Closes celery/celery#1776
Restores accidentally removed tox.ini. Closes #358
Issue #355: Check if the userid is populated for couchdb credentials
Adds Latitia M. Haskins to AUTHORS
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tox.ini