fixed error message in iostream
Merge pull request #1231 from daftshady/master

fixed error message in iostream
Remove example of the legacy HTTPServer callback interface.

Even before the HTTPServerConnectionDelegate interface replaced it,
direct use of this callback interface should have been rare.

This untested example was incorrect when first written and
once fixed only worked on python 2.
Fix compatibility with just-released unittest2 0.6.

This release added some PendingDeprecationWarnings that were
not there previously (and were DeprecationWarnings instead
in newer pythons)
Find real option definer.

When an option is defined through the module level "define" fn, not
directly through the class method, we should look one frame up to
find the real caller.
Merge pull request #1241 from heewa/find_option_definer

Find real option definer.
Add *args, **kw to WebSocketHandler.open.

This matches the default implementations of get/post/put/etc.

Closes #1242
Cleanup Subprocess when tearing down AsyncTestCase

Since an ioloop is created and destroyed between a test's `setUp` and
`tearDown`, and Subprocess holds on to an ioloop until `uninitialize`,
this allows the next test case to use Subprocess correctly.
Merge pull request #1246 from heewa/cleanup_subprocess_in_tests

Cleanup Subprocess when tearing down AsyncTestCase
Fix typo in docs.

Closes #1247.
Fix IOStream flow control under kqueue.

An early attempt to detect closed connections in kqueue led
us to always read from the socket when data was available,
defeating any higher-level flow control.

Add a test to verify this behavior.
Also fix flow control for the select IOLoop.
use the same protocol when redirecting to default host
Merge pull request #1260 from lilydjwg/no-handler-redirect

use the same protocol when redirecting to default host
Merge pull request #2 from tornadoweb/master

Update pull