replaced entry point: slap2 -> slapos

setup.py

@@ -59,8 +59,8 @@ setup(name=name,
           'slapos-watchdog = slapos.grid.watchdog:main',
           'slapproxy = slapos.proxy:main',
           'slapproxy-query = slapos.proxy.query:main',
+          'slapos = slapos.cli.entry:main',
           # Deprecated entry points
-          'slapos = slapos.cli_legacy.entry:main',
           'slapconsole = slapos.cli_legacy.console:console',
           'slapformat = slapos.cli_legacy.format:main',
           'slapgrid-sr = slapos.cli_legacy.slapgrid:runSoftwareRelease',
@@ -69,7 +69,6 @@ setup(name=name,
           'slapgrid-supervisorctl = slapos.cli_legacy.svcbackend:supervisorctl',
           'slapgrid-supervisord = slapos.cli_legacy.svcbackend:supervisord',
           'bang = slapos.cli_legacy.bang:main',
-          'slap2 = slapos.cli.entry:main',
         ],
         'slapos.cli': [
           'cache lookup = slapos.cli.cache:CacheLookupCommand',