unsplit: last fixups

.coveragerc

@@ -2,9 +2,6 @@
 # only record trace data for wormhole.*
 source =
    wormhole
-   txwormhole
-   wormhole_cli
-   wormhole_server
 # and don't trace the test files themselves, or Versioneer's stuff
 omit =
    src/wormhole/test/*

NEWS.md

@@ -16,11 +16,6 @@ User-visible changes in "magic-wormhole":
   the CLI tool.
 * Twisted-flavor input_code() now does readline-based code entry, with
   tab completion.
-* The code has been split into four separate importable packages:
-  * "wormhole", this contains the blocking library and shared code
-  * "txwormhole": twisted lbirary
-  * "wormhole_cli": CLI scripts
-  * "wormhole_server": code for the Rendezvous and Transit Relay servers
 * The package now installs two executables: "wormhole" (for send and
   receive), and "wormhole-server" (to start and manage the relay
   servers).

setup.py

@@ -15,10 +15,10 @@ setup(name="magic-wormhole",
       package_dir={"": "src"},
       packages=["wormhole",
                 "wormhole.blocking",
-                "wormhole.twisted",
                 "wormhole.cli",
                 "wormhole.server",
                 "wormhole.test",
+                "wormhole.twisted",
                 ],
       package_data={"wormhole.server": ["db-schemas/*.sql"]},
       entry_points={"console_scripts":