Merge remote-tracking branch 'nephics/master' into work
Allow handlers to override the selection of "ws" or "wss" in the draft76
handshake, to work with SSL proxies that do not insert an X-Scheme header.

Closes #437.
Merge remote-tracking branch 'davidgaleano/master' into work

Conflicts:
	tornado/websocket.py
Websocket subprotocol updates.

Failure to select a subprotocol is not fatal, so rename method from
validate_subprotocol to select_subprotocol.  Subprotocols are a
comma-separated list in the RFC version, but a single value in
draft76.
Check if the stream is closed before writing final websocket close packet.

Closes #390.
Remove stray log line
Disable slow websocket performance tests by default.

Add pypy to the mix for when we do run the perf tests.  Depending on
the benchmark pypy is ~twice as fast as cpython 2.7
Refactor websocket close logic; remove dependency on singleton IOLoop.
Merge remote-tracking branch 'MrJoes/master' into work

Conflicts:
	tornado/websocket.py
Update websocket chat demo to work when not addressed as localhost.

Turn on draft76 support.
Merge remote-tracking branch 'lerks/master' into work
fix curl basic auth
Always set Etag in StaticFileHandler so it won't break if the default
Etag implementation in RequestHandler changes.
Merge remote-tracking branch 'birknilson/static_url_override' into work
Merge commit '59812' into work
Make StaticFileHandler.parse_url_path an instance method, and make
it responsible for os.path.sep conversion.

Assorted doc updates for StaticFileHandler.
Release note updates
Doc updates
Add a timeout to test_sslv2_fail so it passes on cygwin.
change encode('ascii') to utf8()