Tornado depends on setuptools
Merge branch 't/16996/sage_ipynb' into t/17145/tornado_depends_on_setuptools

Conflicts:
	build/deps
Trac #17145: Tornado depends on setuptools

{{{
Traceback (most recent call last):
  File "setup.py", line 22, in <module>
    import setuptools
IOError: zipimport: can not open file /Users/buildslave-
sage/slave/sage_git/build/local/lib/python2.7/site-
packages/setuptools-3.6-py2.7.egg
Error installing tornado ... exiting

real    0m0.090s
user    0m0.045s
sys     0m0.029s
************************************************************************
Error installing package tornado-3.1.1
************************************************************************
}}}

URL: http://trac.sagemath.org/17145
Reported by: vbraun
Ticket author(s): Volker Braun
Reviewer(s): Jeroen Demeyer