Fixups after rebase

Author: mdboom

setupext.py

@@ -902,7 +902,7 @@ def check(self):
                 "backend. pip/easy_install may attempt to install it "
                 "after matplotlib.")
 
-        return "using tornado version %s" % tornado.__version__
+        return "using tornado version %s" % tornado.version
 
     def get_install_requires(self):
         return ['tornado']