added zmq controller/engine entry points

setup.py

@@ -215,9 +215,8 @@ if 'setuptools' in sys.modules:
             'ipython = IPython.frontend.terminal.ipapp:launch_new_instance',
             'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main',
             'pycolor = IPython.utils.PyColorize:main',
-            # 'ipcontroller = IPython.kernel.ipcontrollerapp:launch_new_instance',
-            # 'ipengine = IPython.kernel.ipengineapp:launch_new_instance',
-            # 'ipcluster = IPython.kernel.ipclusterapp:launch_new_instance',
+            'ipcontrollerz = IPython.zmq.parallel.controller:main',
+            'ipenginez = IPython.zmq.parallel.engine:main',
             'iptest = IPython.testing.iptest:main',
             'irunner = IPython.lib.irunner:main'
         ]