Update to Tornado 3.0
Merge remote-tracking branch 'upstream/develop'