Celery 3.1 switch.
Improved test coverage.
Travis fix.