Merge pull request #2727 from andersk/304

Clear fewer headers on 1xx/204/304 responses

diff --cc tornado/test/web_test.py
Simple merge

diff --cc tornado/web.py
Simple merge