Merge 'master' into bootstrapping-and-resources

Signed-off-by: Noah Treuhaft <noah.treuhaft@docker.com>

cmd/cli/main.go

@@ -43,7 +43,11 @@ func main() {
 	cmd.AddCommand(infoCommand(f))
 	cmd.AddCommand(templateCommand(f))
 	cmd.AddCommand(managerCommand(f))
-	cmd.AddCommand(pluginCommand(f), instancePluginCommand(f), groupPluginCommand(f), flavorPluginCommand(f))
+	cmd.AddCommand(metadataCommand(f))
+	cmd.AddCommand(pluginCommand(f))
+
+	cmd.AddCommand(instancePluginCommand(f), groupPluginCommand(f), flavorPluginCommand(f))
+
 	cmd.AddCommand(resourceCommand(f))
 
 	err := cmd.Execute()

vendor.conf

@@ -43,11 +43,12 @@ github.com/spf13/cobra			6e91dde
 github.com/spf13/pflag			5ccb023
 github.com/stretchr/testify		v1.1.4-4-g976c720
 github.com/twmb/algoimpl		716f8e7
+golang.org/x/crypto/pbkdf2		b07d8c9
 golang.org/x/net			0dd7c8d
 golang.org/x/sys			b699b70
 golang.org/x/text			a263ba8
 gopkg.in/juju/names.v2			0847c26
 gopkg.in/mgo.v2/bson			3f83fa5
 gopkg.in/mgo.v2/internal		3f83fa5
 gopkg.in/tylerb/graceful.v1		v1.2.13
-
+gopkg.in/yaml.v2			a5b47d3