Merge pull request #8 from ekristen/master

adding friendly-name to the container info so it can be used in templates

Author: jwilder

docker-gen.go

@@ -40,6 +40,7 @@ type RuntimeContainer struct {
 	ID        string
 	Addresses []Address
 	Gateway   string
+	Name      string
 	Image     DockerImage
 	Env       map[string]string
 }

docker_client.go

@@ -199,6 +199,7 @@ func getContainers(client *docker.Client) ([]*RuntimeContainer, error) {
 				Repository: repository,
 				Tag:        tag,
 			},
+			Name:      strings.TrimLeft(container.Name, "/"),
 			Gateway:   container.NetworkSettings.Gateway,
 			Addresses: []Address{},
 			Env:       make(map[string]string),