Nagle

I merged master into the branch, which kind of blew up the diff, but this gets the tests passing on python 2.6-3.3 for this branch.

I still want to add a tcp_nodelay flag to the connection classes, will work on that next