Merge branch 'master' into dcow/host-id

Author: dcow

command/ssh/hosts.go

@@ -67,7 +67,7 @@ func hostsAction(ctx *cli.Context) error {
 	// Format in tab-separated columns with a tab stop of 8.
 	w.Init(os.Stdout, 0, 8, 0, '\t', 0)
 
-	fmt.Fprintln(w, "HOSTNAME\tID\tGROUPS")
+	fmt.Fprintln(w, "HOSTNAME\tID\tTAGS")
 	for _, h := range resp.Hosts {
 		groups := ""
 		for i, hg := range h.HostGroups {