Merge branch 'retry-effects' into pure-server-info
start converting get all server info function to returning effect and taking request_func
Merge branch 'service-bound-http' into pure-server-info
get rid of funny print
some cleanups
Merge branch 'service-bound-http' into pure-server-info
Merge branch 'service-bound-http' into pure-server-info

Conflicts:
	otter/convergence.py
update to latest API
here's an idea for retry in request
should_retry_effect now passes failure to interval function.
checkpoint some rubbish retry support in http, probably not to stay.
a whole mess of spikey declarative retry stuff.
Effects up through get_scaling_group_servers
ok let's try this. convergence uses retry_effect explicitly; get rid of request_service(retry=True)
Merge branch 'master' into pure-server-info

Conflicts:
	otter/convergence.py
	otter/http.py
	otter/test/test_convergence.py
rename ShouldRetryEffect to ShouldRetry, and add a bunch of docs
a lot more tests for the new otter.retry code, and some bugfixes and cleanups.
lint / docs
take convergence changes from pure-server-info

Merge branch 'pure-server-info' into pure-server-info-2

Conflicts:
	otter/test/test_retry.py
remove unnecessary __future__ import