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 :|

tests/node_test_rig/src/lib.rs

@@ -69,7 +69,9 @@ pub fn testing_client_config() -> ClientConfig {
     // Setting ports to `0` means that the OS will choose some available port.
     client_config.network.libp2p_port = 0;
     client_config.network.discovery_port = 0;
+    client_config.rest_api.enabled = true;
     client_config.rest_api.port = 0;
+    client_config.websocket_server.enabled = true;
     client_config.websocket_server.port = 0;
 
     client_config.dummy_eth1_backend = true;