Merge branch 'master' into f-docker-check

api/README.md

@@ -17,13 +17,18 @@ Usage
 Below is an example of using the Consul client:
 
 ```go
-// Get a new client, with KV endpoints
-client, _ := api.NewClient(api.DefaultConfig())
+// Get a new client
+client, err := api.NewClient(api.DefaultConfig())
+if err != nil {
+    panic(err)
+}
+
+// Get a handle to the KV API
 kv := client.KV()
 
 // PUT a new KV pair
 p := &api.KVPair{Key: "foo", Value: []byte("test")}
-_, err := kv.Put(p, nil)
+_, err = kv.Put(p, nil)
 if err != nil {
     panic(err)
 }