reformat vendor.conf, and use tags again, to match containerd

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

vendor.conf

@@ -1,85 +1,85 @@
 # cri dependencies
-github.com/tchap/go-patricia v2.2.6
-github.com/opencontainers/selinux v1.2.2
-github.com/docker/docker 86f080cff0914e9694068ed78d503701667c4c00
-github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580
+github.com/tchap/go-patricia                        v2.2.6
+github.com/opencontainers/selinux                   v1.2.2
+github.com/docker/docker                            86f080cff0914e9694068ed78d503701667c4c00
+github.com/docker/distribution                      0d3efadf0154c2b8a4e7b6621fff9809655cc580
 
 # containerd dependencies
-github.com/BurntSushi/toml v0.3.1
-github.com/Microsoft/go-winio v0.4.14
-github.com/Microsoft/hcsshim 9e921883ac929bbe515b39793ece99ce3a9d7706
-github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
-github.com/containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
-github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
-github.com/containerd/containerd v1.3.2
-github.com/containerd/continuity f2a389ac0a02ce21c09edd7344677a601970f41c
-github.com/containerd/fifo bda0ff6ed73c67bfb5e62bc9c697f146b7fd7f13
-github.com/containerd/go-runc e029b79d8cda8374981c64eba71f28ec38e5526f
-github.com/containerd/ttrpc 92c8520ef9f86600c650dd540266a007bf03670f
-github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40
-github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6 # v14
-github.com/cpuguy83/go-md2man 7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19 # v1.0.10
-github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
-github.com/docker/go-metrics 4ea375f7759c82740c893fc030bc37088d2ec098
-github.com/docker/go-units v0.4.0
-github.com/godbus/dbus c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f # v3
-github.com/gogo/googleapis v1.2.0
-github.com/gogo/protobuf v1.2.1
-github.com/golang/protobuf v1.2.0
-github.com/google/uuid 0cd6bf5da1e1c83f8b45653022c74f71af0538a4 # v1.1.1
-github.com/grpc-ecosystem/go-grpc-prometheus 6b7015e65d366bf3f19b2b2a000a831940f0f7e0 # v1.1
-github.com/hashicorp/golang-lru v0.5.3
-github.com/imdario/mergo 7c29201646fa3de8506f701213473dd407f19646 # v0.3.7
-github.com/matttproud/golang_protobuf_extensions v1.0.1
-github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
-github.com/opencontainers/image-spec v1.0.1
-github.com/opencontainers/runc d736ef14f0288d6993a1845745d6756cfc9ddd5a # v1.0.0-rc9
-github.com/opencontainers/runtime-spec 29686dbc5559d93fb1ef402eeda3e35c38d75af4 # v1.0.1-59-g29686db
-github.com/pkg/errors v0.8.1
-github.com/prometheus/client_golang f4fb1b73fb099f396a7f0036bf86aa8def4ed823
-github.com/prometheus/client_model 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
-github.com/prometheus/common 89604d197083d4781071d3c65855d24ecfb0a563
-github.com/prometheus/procfs cb4147076ac75738c9a7d279075a253c0cc5acbd
-github.com/russross/blackfriday 05f3235734ad95d0016f6a23902f06461fcf567a # v1.5.2
-github.com/sirupsen/logrus v1.4.1
-github.com/syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2
-github.com/urfave/cli v1.22.0
-go.etcd.io/bbolt v1.3.3
-go.opencensus.io v0.22.0
-golang.org/x/net f3200d17e092c607f615320ecaad13d87ad9a2b3
-golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e
-golang.org/x/sys 9eafafc0a87e0fd0aeeba439a4573537970c44c7 https://github.com/golang/sys
-golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
-google.golang.org/appengine v1.5.0
-google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
-google.golang.org/grpc 6eaf6f47437a6b4e2153a190160ef39a92c7eceb # v1.23.0
+github.com/BurntSushi/toml                          v0.3.1
+github.com/Microsoft/go-winio                       v0.4.14
+github.com/Microsoft/hcsshim                        9e921883ac929bbe515b39793ece99ce3a9d7706
+github.com/beorn7/perks                             4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
+github.com/containerd/cgroups                       c4b9ac5c7601384c965b9646fc515884e091ebb9
+github.com/containerd/console                       0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
+github.com/containerd/containerd                    v1.3.2
+github.com/containerd/continuity                    f2a389ac0a02ce21c09edd7344677a601970f41c
+github.com/containerd/fifo                          bda0ff6ed73c67bfb5e62bc9c697f146b7fd7f13
+github.com/containerd/go-runc                       e029b79d8cda8374981c64eba71f28ec38e5526f
+github.com/containerd/ttrpc                         92c8520ef9f86600c650dd540266a007bf03670f
+github.com/containerd/typeurl                       a93fcdb778cd272c6e9b3028b2f42d813e785d40
+github.com/coreos/go-systemd                        v14
+github.com/cpuguy83/go-md2man                       v1.0.10
+github.com/docker/go-events                         9461782956ad83b30282bf90e31fa6a70c255ba9
+github.com/docker/go-metrics                        4ea375f7759c82740c893fc030bc37088d2ec098
+github.com/docker/go-units                          v0.4.0
+github.com/godbus/dbus                              v3
+github.com/gogo/googleapis                          v1.2.0
+github.com/gogo/protobuf                            v1.2.1
+github.com/golang/protobuf                          v1.2.0
+github.com/google/uuid                              v1.1.1
+github.com/grpc-ecosystem/go-grpc-prometheus        v1.1
+github.com/hashicorp/golang-lru                     v0.5.3
+github.com/imdario/mergo                            v0.3.7
+github.com/matttproud/golang_protobuf_extensions    v1.0.1
+github.com/opencontainers/go-digest                 c9281466c8b2f606084ac71339773efd177436e7
+github.com/opencontainers/image-spec                v1.0.1
+github.com/opencontainers/runc                      v1.0.0-rc9
+github.com/opencontainers/runtime-spec              29686dbc5559d93fb1ef402eeda3e35c38d75af4 # v1.0.1-59-g29686db
+github.com/pkg/errors                               v0.8.1
+github.com/prometheus/client_golang                 f4fb1b73fb099f396a7f0036bf86aa8def4ed823
+github.com/prometheus/client_model                  99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
+github.com/prometheus/common                        89604d197083d4781071d3c65855d24ecfb0a563
+github.com/prometheus/procfs                        cb4147076ac75738c9a7d279075a253c0cc5acbd
+github.com/russross/blackfriday                     v1.5.2
+github.com/sirupsen/logrus                          v1.4.1
+github.com/syndtr/gocapability                      d98352740cb2c55f81556b63d4a1ec64c5a319c2
+github.com/urfave/cli                               v1.22.0
+go.etcd.io/bbolt                                    v1.3.3
+go.opencensus.io                                    v0.22.0
+golang.org/x/net                                    f3200d17e092c607f615320ecaad13d87ad9a2b3
+golang.org/x/sync                                   42b317875d0fa942474b76e1b46a6060d720ae6e
+golang.org/x/sys                                    9eafafc0a87e0fd0aeeba439a4573537970c44c7
+golang.org/x/text                                   19e51611da83d6be54ddafce4a4af510cb3e9ea4
+google.golang.org/appengine                         v1.5.0
+google.golang.org/genproto                          d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
+google.golang.org/grpc                              v1.23.0
 
 # kubernetes dependencies
-sigs.k8s.io/yaml v1.1.0
-k8s.io/utils e782cd3c129fc98ee807f3c889c0f26eb7c9daf5
-k8s.io/kubernetes v1.16.6
-k8s.io/klog v1.0.0
-k8s.io/cri-api kubernetes-1.16.6
-k8s.io/client-go kubernetes-1.16.6
-k8s.io/api kubernetes-1.16.6
-k8s.io/apiserver kubernetes-1.16.6
-k8s.io/apimachinery kubernetes-1.16.6
-gopkg.in/yaml.v2 53403b58ad1b561927d19068c655246f2db79d48 # v2.2.8
-gopkg.in/inf.v0 v0.9.1
-golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef
-golang.org/x/oauth2 0f29369cfe4552d0e4bcddc57cc75f4d7e672a33
-golang.org/x/crypto 60c769a6c58655dab1b9adac0d58967dd517cfba
-github.com/stretchr/testify v1.4.0
-github.com/pmezard/go-difflib v1.0.0
-github.com/modern-go/reflect2 v1.0.1
-github.com/modern-go/concurrent 1.0.3
-github.com/json-iterator/go v1.1.8
-github.com/google/gofuzz v1.0.0
-github.com/emicklei/go-restful v2.9.5
-github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528
-github.com/davecgh/go-spew v1.1.1
+sigs.k8s.io/yaml                                    v1.1.0
+k8s.io/utils                                        e782cd3c129fc98ee807f3c889c0f26eb7c9daf5
+k8s.io/kubernetes                                   v1.16.6
+k8s.io/klog                                         v1.0.0
+k8s.io/cri-api                                      v0.16.6
+k8s.io/client-go                                    v0.16.6
+k8s.io/api                                          v0.16.6
+k8s.io/apiserver                                    v0.16.6
+k8s.io/apimachinery                                 v0.16.6
+gopkg.in/yaml.v2                                    v2.2.8
+gopkg.in/inf.v0                                     v0.9.1
+golang.org/x/time                                   9d24e82272b4f38b78bc8cff74fa936d31ccd8ef
+golang.org/x/oauth2                                 0f29369cfe4552d0e4bcddc57cc75f4d7e672a33
+golang.org/x/crypto                                 60c769a6c58655dab1b9adac0d58967dd517cfba
+github.com/stretchr/testify                         v1.4.0
+github.com/pmezard/go-difflib                       v1.0.0
+github.com/modern-go/reflect2                       v1.0.1
+github.com/modern-go/concurrent                     1.0.3
+github.com/json-iterator/go                         v1.1.8
+github.com/google/gofuzz                            v1.0.0
+github.com/emicklei/go-restful                      v2.9.5
+github.com/docker/spdystream                        449fdfce4d962303d702fec724ef0ad181c92528
+github.com/davecgh/go-spew                          v1.1.1
 
 # cni dependencies
-github.com/containernetworking/plugins v0.7.6
-github.com/containernetworking/cni v0.7.1
-github.com/containerd/go-cni 49fbd9b210f3c8ee3b7fd3cd797aabaf364627c1
+github.com/containernetworking/plugins              v0.7.6
+github.com/containernetworking/cni                  v0.7.1
+github.com/containerd/go-cni                        49fbd9b210f3c8ee3b7fd3cd797aabaf364627c1