Improve beacon node logging (#660)

* Squish prev commits into a single atop master

* Enable http and ws during testing

* Checkout clobbered files from master

* Further un-clobber rest_api changes

* Tidy formatting

* Do rust-fmt's job for it :|

beacon_node/src/lib.rs

@@ -131,7 +131,8 @@ impl<E: EthSpec> ProductionBeaconNode<E> {
                     .system_time_slot_clock()?
                     .websocket_event_handler(client_config.websocket_server.clone())?
                     .build_beacon_chain()?
-                    .libp2p_network(&client_config.network)?;
+                    .libp2p_network(&client_config.network)?
+                    .notifier()?;
 
                 let builder = if client_config.rest_api.enabled {
                     builder.http_server(&client_config, &http_eth2_config)?
@@ -139,8 +140,6 @@ impl<E: EthSpec> ProductionBeaconNode<E> {
                     builder
                 };
 
-                let builder = builder.peer_count_notifier()?.slot_notifier()?;
-
                 Ok(Self(builder.build()))
             })
     }