Clean up connection error handling for bunny a bit
Wait even longer for queues to settle on travis