Make confluent and confluentsrv.py identical

The two files should be identical.  confluentsrv.py exists
only because PyInstaller struggles unless the target is a
'py' file and does not have some namespace conflict with a
module.

confluent_server/bin/confluent

@@ -22,17 +22,17 @@ path = os.path.realpath(os.path.join(path, '..', 'lib', 'python'))
 if path.startswith('/opt'):
     # if installed into system path, do not muck with things
     sys.path.append(path)
-from confluent import main
+import confluent.main
 
 #import cProfile
 #import time
 #p = cProfile.Profile(time.clock)
 #p.enable()
 #try:
+import multiprocessing
 if __name__ == '__main__':
-    import multiprocessing
     multiprocessing.freeze_support()
-    main.run()
+    confluent.main.run()
 #except:
 #   pass
 #p.disable()