Add Peter Waller to contributors
Merge pull request #278 from pwaller/contrib

Add myself to CONTRIBUTORS.txt
Add proxy_basic_auth option to util.make_headers()

With this option, `util.make_headers()` will return a dictionary
containing the key `Proxy-Authorization` needed to authenticate against
proxy servers.
Merge pull request #279 from clarete/master

Add proxy_basic_auth option to util.make_headers()
add tox as test dependency
Merge pull request #282 from kevinburke/tox

add tox as test dependency
Increase timeout for Windows.
Fixed test_fields on Windows and some PEP8 love.
Use Tornado 3.x in tests.
Refactored tornado test cases.

Use an explicit IOLoop instance so it should be more clear what's going
on internally.
Fixed check for IPv6 support.
Merge pull request #288 from schlamar/fix-ipv6-check

Fixed check for IPv6 support.
Merge pull request #285 from schlamar/timeout-win

Increase timeout for Windows.
Merge pull request #286 from schlamar/test-fields

Fixed test_fields on Windows and some PEP8 love.
Revert #282.
Merge pull request #287 from schlamar/refactor-tornado

Refactored tornado test cases.
Merge pull request #5 from shazow/master

latest from upstream