Increase individual test timeout

test_dependent_behind_dequeue is running right at 30 seconds now
(slowed by the addition of nodepool and ansible/git tasks to all
tests).  Increase the timeout to compensate.

Also increase the settle timeout.  Because of the same additions,
some complex jobs take more than 10 seconds to stabilize now.

Change-Id: I7500b55cbe9e349b826760f31168c14087cf236f
diff --git a/tox.ini b/tox.ini
index b7cbf27..58acf09 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@
 setenv = STATSD_HOST=127.0.0.1
          STATSD_PORT=8125
          VIRTUAL_ENV={envdir}
-         OS_TEST_TIMEOUT=30
+         OS_TEST_TIMEOUT=60
          OS_LOG_DEFAULTS={env:OS_LOG_DEFAULTS:gear=WARNING}
 passenv = ZUUL_TEST_ROOT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE
 usedevelop = True