Enable tornado and ipython
Merge remote-tracking branch 'origin/enable_tornado_ipython' into devel-master

* origin/enable_tornado_ipython:
  Enable tornado and ipython