Minor documentation tweak
Fix benchmark code to current io-streams

The withFileAsOutput signature changed in io-streams. Much better now!
Adjust code to unbreak our benchmark code that was using it.
Limit recursion depth when redirecting

Convenience API's get function will follow redirects. Limit this to a
depth of 5 hops.
Merge remote-tracking branch 'andrew/master'

Conflicts:
	tests/TestServer.hs