diff --git a/.mailmap b/.mailmap index e4e50ee7..f0452da6 100644 --- a/.mailmap +++ b/.mailmap @@ -13,3 +13,4 @@ Sharif Nassar Sharif Nassar Sven Dowideit Vincent Giersch Vincent Giersch davidli davidli +Omer Cohen Omer Cohen \ No newline at end of file diff --git a/AUTHORS b/AUTHORS index a44266b0..aa6f138a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -110,4 +110,4 @@ weiyuan.yl xg.song xiekeyang Yann ROBERT -yuzou +yuzou \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 0ab9629e..abb3e3bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ -FROM golang:1.5.3 +FROM golang:1.6 RUN apt-get update && \ apt-get install -y apache2-utils && \ rm -rf /var/lib/apt/lists/* ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution -ENV GOPATH $DISTRIBUTION_DIR/Godeps/_workspace:$GOPATH ENV DOCKER_BUILDTAGS include_oss include_gcs WORKDIR $DISTRIBUTION_DIR diff --git a/Makefile b/Makefile index 2ba01083..a87f4c91 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ GO_LDFLAGS=-ldflags "-X `go list ./version`.Version=$(VERSION)" .PHONY: clean all fmt vet lint build test binaries .DEFAULT: all -all: fmt vet fmt lint build test binaries +all: fmt vet lint build test binaries AUTHORS: .mailmap .git/HEAD git log --format='%aN <%aE>' | sort -fu > $@ @@ -24,51 +24,61 @@ AUTHORS: .mailmap .git/HEAD version/version.go: ./version/version.sh > $@ -${PREFIX}/bin/registry: version/version.go $(shell find . -type f -name '*.go') +# Required for go 1.5 to build +GO15VENDOREXPERIMENT := 1 + +# Package list +PKGS := $(shell go list -tags "${DOCKER_BUILDTAGS}" ./... | grep -v ^github.com/docker/distribution/vendor/) + +# Resolving binary dependencies for specific targets +GOLINT_BIN := $(GOPATH)/bin/golint +GOLINT := $(shell [ -x $(GOLINT_BIN) ] && echo $(GOLINT_BIN) || echo '') + +${PREFIX}/bin/registry: $(wildcard **/*.go) @echo "+ $@" @go build -tags "${DOCKER_BUILDTAGS}" -o $@ ${GO_LDFLAGS} ${GO_GCFLAGS} ./cmd/registry -${PREFIX}/bin/digest: version/version.go $(shell find . -type f -name '*.go') +${PREFIX}/bin/digest: $(wildcard **/*.go) @echo "+ $@" @go build -tags "${DOCKER_BUILDTAGS}" -o $@ ${GO_LDFLAGS} ${GO_GCFLAGS} ./cmd/digest -${PREFIX}/bin/registry-api-descriptor-template: version/version.go $(shell find . -type f -name '*.go') +${PREFIX}/bin/registry-api-descriptor-template: $(wildcard **/*.go) @echo "+ $@" @go build -o $@ ${GO_LDFLAGS} ${GO_GCFLAGS} ./cmd/registry-api-descriptor-template docs/spec/api.md: docs/spec/api.md.tmpl ${PREFIX}/bin/registry-api-descriptor-template ./bin/registry-api-descriptor-template $< > $@ -# Depends on binaries because vet will silently fail if it can't load compiled -# imports -vet: binaries +vet: @echo "+ $@" - @go vet ./... + @go vet -tags "${DOCKER_BUILDTAGS}" $(PKGS) fmt: @echo "+ $@" - @test -z "$$(gofmt -s -l . | grep -v Godeps/_workspace/src/ | tee /dev/stderr)" || \ - echo "+ please format Go code with 'gofmt -s'" + @test -z "$$(gofmt -s -l . 2>&1 | grep -v ^vendor/ | tee /dev/stderr)" || \ + (echo >&2 "+ please format Go code with 'gofmt -s'" && false) lint: @echo "+ $@" - @test -z "$$(golint ./... | grep -v Godeps/_workspace/src/ | tee /dev/stderr)" + $(if $(GOLINT), , \ + $(error Please install golint: `go get -u github.com/golang/lint/golint`)) + @test -z "$$($(GOLINT) ./... 2>&1 | grep -v ^vendor/ | tee /dev/stderr)" build: @echo "+ $@" - @go build -tags "${DOCKER_BUILDTAGS}" -v ${GO_LDFLAGS} ./... + @go build -tags "${DOCKER_BUILDTAGS}" -v ${GO_LDFLAGS} $(PKGS) test: @echo "+ $@" - @go test -test.short -tags "${DOCKER_BUILDTAGS}" ./... + @go test -test.short -tags "${DOCKER_BUILDTAGS}" $(PKGS) test-full: @echo "+ $@" - @go test ./... + @go test -tags "${DOCKER_BUILDTAGS}" $(PKGS) binaries: ${PREFIX}/bin/registry ${PREFIX}/bin/digest ${PREFIX}/bin/registry-api-descriptor-template @echo "+ $@" clean: @echo "+ $@" - @rm -rf "${PREFIX}/bin/registry" "${PREFIX}/bin/registry-api-descriptor-template" + @rm -rf "${PREFIX}/bin/registry" "${PREFIX}/bin/digest" "${PREFIX}/bin/registry-api-descriptor-template" diff --git a/circle.yml b/circle.yml index f658d111..f0e753c7 100644 --- a/circle.yml +++ b/circle.yml @@ -8,7 +8,7 @@ machine: post: # go - - gvm install go1.5.3 --prefer-binary --name=stable + - gvm install go1.6 --prefer-binary --name=stable environment: # Convenient shortcuts to "common" locations @@ -51,24 +51,24 @@ test: # First thing: build everything. This will catch compile errors, and it's # also necessary for go vet to work properly (see #807). - - gvm use stable && godep go install ./...: + - gvm use stable && godep go install $(go list ./... | grep -v "/vendor/"): pwd: $BASE_STABLE # FMT - - gvm use stable && test -z "$(gofmt -s -l . | grep -v Godeps/_workspace/src/ | tee /dev/stderr)": + - gvm use stable && make fmt: pwd: $BASE_STABLE # VET - - gvm use stable && go vet ./...: + - gvm use stable && make vet: pwd: $BASE_STABLE # LINT - - gvm use stable && test -z "$(golint ./... | grep -v Godeps/_workspace/src/ | tee /dev/stderr)": + - gvm use stable && make lint: pwd: $BASE_STABLE override: # Test stable, and report - - gvm use stable; export ROOT_PACKAGE=$(go list .); go list -tags "$DOCKER_BUILDTAGS" ./... | xargs -L 1 -I{} bash -c 'export PACKAGE={}; godep go test -tags "$DOCKER_BUILDTAGS" -test.short -coverprofile=$GOPATH/src/$PACKAGE/coverage.out -coverpkg=$(./coverpkg.sh $PACKAGE $ROOT_PACKAGE) $PACKAGE': + - gvm use stable; export ROOT_PACKAGE=$(go list .); go list -tags "$DOCKER_BUILDTAGS" ./... | grep -v "/vendor/" | xargs -L 1 -I{} bash -c 'export PACKAGE={}; godep go test -tags "$DOCKER_BUILDTAGS" -test.short -coverprofile=$GOPATH/src/$PACKAGE/coverage.out -coverpkg=$(./coverpkg.sh $PACKAGE $ROOT_PACKAGE) $PACKAGE': timeout: 600 pwd: $BASE_STABLE diff --git a/Godeps/_workspace/.gitignore b/vendor/.gitignore similarity index 100% rename from Godeps/_workspace/.gitignore rename to vendor/.gitignore diff --git a/Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/.gitignore b/vendor/github.com/Azure/azure-sdk-for-go/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/.gitignore rename to vendor/github.com/Azure/azure-sdk-for-go/.gitignore diff --git a/Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/.travis.yml b/vendor/github.com/Azure/azure-sdk-for-go/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/.travis.yml rename to vendor/github.com/Azure/azure-sdk-for-go/.travis.yml diff --git a/Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/LICENSE b/vendor/github.com/Azure/azure-sdk-for-go/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/LICENSE rename to vendor/github.com/Azure/azure-sdk-for-go/LICENSE diff --git a/Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/README.md b/vendor/github.com/Azure/azure-sdk-for-go/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/README.md rename to vendor/github.com/Azure/azure-sdk-for-go/README.md diff --git a/Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/storage/blob.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/blob.go similarity index 100% rename from Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/storage/blob.go rename to vendor/github.com/Azure/azure-sdk-for-go/storage/blob.go diff --git a/Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/storage/client.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/client.go similarity index 100% rename from Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/storage/client.go rename to vendor/github.com/Azure/azure-sdk-for-go/storage/client.go diff --git a/Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/storage/file.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/file.go similarity index 100% rename from Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/storage/file.go rename to vendor/github.com/Azure/azure-sdk-for-go/storage/file.go diff --git a/Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/storage/queue.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/queue.go similarity index 100% rename from Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/storage/queue.go rename to vendor/github.com/Azure/azure-sdk-for-go/storage/queue.go diff --git a/Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/storage/util.go b/vendor/github.com/Azure/azure-sdk-for-go/storage/util.go similarity index 100% rename from Godeps/_workspace/src/github.com/Azure/azure-sdk-for-go/storage/util.go rename to vendor/github.com/Azure/azure-sdk-for-go/storage/util.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.gitignore b/vendor/github.com/Sirupsen/logrus/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/.gitignore rename to vendor/github.com/Sirupsen/logrus/.gitignore diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml b/vendor/github.com/Sirupsen/logrus/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml rename to vendor/github.com/Sirupsen/logrus/.travis.yml diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/CHANGELOG.md b/vendor/github.com/Sirupsen/logrus/CHANGELOG.md similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/CHANGELOG.md rename to vendor/github.com/Sirupsen/logrus/CHANGELOG.md diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE b/vendor/github.com/Sirupsen/logrus/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE rename to vendor/github.com/Sirupsen/logrus/LICENSE diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/README.md b/vendor/github.com/Sirupsen/logrus/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/README.md rename to vendor/github.com/Sirupsen/logrus/README.md diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/entry.go b/vendor/github.com/Sirupsen/logrus/entry.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/entry.go rename to vendor/github.com/Sirupsen/logrus/entry.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/entry_test.go b/vendor/github.com/Sirupsen/logrus/entry_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/entry_test.go rename to vendor/github.com/Sirupsen/logrus/entry_test.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/basic/basic.go b/vendor/github.com/Sirupsen/logrus/examples/basic/basic.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/basic/basic.go rename to vendor/github.com/Sirupsen/logrus/examples/basic/basic.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/hook/hook.go b/vendor/github.com/Sirupsen/logrus/examples/hook/hook.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/hook/hook.go rename to vendor/github.com/Sirupsen/logrus/examples/hook/hook.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/exported.go b/vendor/github.com/Sirupsen/logrus/exported.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/exported.go rename to vendor/github.com/Sirupsen/logrus/exported.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter.go b/vendor/github.com/Sirupsen/logrus/formatter.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter.go rename to vendor/github.com/Sirupsen/logrus/formatter.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter_bench_test.go b/vendor/github.com/Sirupsen/logrus/formatter_bench_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter_bench_test.go rename to vendor/github.com/Sirupsen/logrus/formatter_bench_test.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash.go b/vendor/github.com/Sirupsen/logrus/formatters/logstash/logstash.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash.go rename to vendor/github.com/Sirupsen/logrus/formatters/logstash/logstash.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash_test.go b/vendor/github.com/Sirupsen/logrus/formatters/logstash/logstash_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash_test.go rename to vendor/github.com/Sirupsen/logrus/formatters/logstash/logstash_test.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hook_test.go b/vendor/github.com/Sirupsen/logrus/hook_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hook_test.go rename to vendor/github.com/Sirupsen/logrus/hook_test.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks.go b/vendor/github.com/Sirupsen/logrus/hooks.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks.go rename to vendor/github.com/Sirupsen/logrus/hooks.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go b/vendor/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go rename to vendor/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake_test.go b/vendor/github.com/Sirupsen/logrus/hooks/airbrake/airbrake_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake_test.go rename to vendor/github.com/Sirupsen/logrus/hooks/airbrake/airbrake_test.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go b/vendor/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go rename to vendor/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag_test.go b/vendor/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag_test.go rename to vendor/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag_test.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/README.md b/vendor/github.com/Sirupsen/logrus/hooks/papertrail/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/README.md rename to vendor/github.com/Sirupsen/logrus/hooks/papertrail/README.md diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go b/vendor/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go rename to vendor/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail_test.go b/vendor/github.com/Sirupsen/logrus/hooks/papertrail/papertrail_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail_test.go rename to vendor/github.com/Sirupsen/logrus/hooks/papertrail/papertrail_test.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/README.md b/vendor/github.com/Sirupsen/logrus/hooks/sentry/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/README.md rename to vendor/github.com/Sirupsen/logrus/hooks/sentry/README.md diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry.go b/vendor/github.com/Sirupsen/logrus/hooks/sentry/sentry.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry.go rename to vendor/github.com/Sirupsen/logrus/hooks/sentry/sentry.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry_test.go b/vendor/github.com/Sirupsen/logrus/hooks/sentry/sentry_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry_test.go rename to vendor/github.com/Sirupsen/logrus/hooks/sentry/sentry_test.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/README.md b/vendor/github.com/Sirupsen/logrus/hooks/syslog/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/README.md rename to vendor/github.com/Sirupsen/logrus/hooks/syslog/README.md diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog.go b/vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog.go rename to vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog_test.go b/vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog_test.go rename to vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog_test.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter.go b/vendor/github.com/Sirupsen/logrus/json_formatter.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter.go rename to vendor/github.com/Sirupsen/logrus/json_formatter.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter_test.go b/vendor/github.com/Sirupsen/logrus/json_formatter_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter_test.go rename to vendor/github.com/Sirupsen/logrus/json_formatter_test.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logger.go b/vendor/github.com/Sirupsen/logrus/logger.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/logger.go rename to vendor/github.com/Sirupsen/logrus/logger.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus.go b/vendor/github.com/Sirupsen/logrus/logrus.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus.go rename to vendor/github.com/Sirupsen/logrus/logrus.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus_test.go b/vendor/github.com/Sirupsen/logrus/logrus_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus_test.go rename to vendor/github.com/Sirupsen/logrus/logrus_test.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_darwin.go b/vendor/github.com/Sirupsen/logrus/terminal_darwin.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_darwin.go rename to vendor/github.com/Sirupsen/logrus/terminal_darwin.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_freebsd.go b/vendor/github.com/Sirupsen/logrus/terminal_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_freebsd.go rename to vendor/github.com/Sirupsen/logrus/terminal_freebsd.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_linux.go b/vendor/github.com/Sirupsen/logrus/terminal_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_linux.go rename to vendor/github.com/Sirupsen/logrus/terminal_linux.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_notwindows.go b/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_notwindows.go rename to vendor/github.com/Sirupsen/logrus/terminal_notwindows.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_openbsd.go b/vendor/github.com/Sirupsen/logrus/terminal_openbsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_openbsd.go rename to vendor/github.com/Sirupsen/logrus/terminal_openbsd.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_windows.go b/vendor/github.com/Sirupsen/logrus/terminal_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_windows.go rename to vendor/github.com/Sirupsen/logrus/terminal_windows.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter.go b/vendor/github.com/Sirupsen/logrus/text_formatter.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter.go rename to vendor/github.com/Sirupsen/logrus/text_formatter.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter_test.go b/vendor/github.com/Sirupsen/logrus/text_formatter_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter_test.go rename to vendor/github.com/Sirupsen/logrus/text_formatter_test.go diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/writer.go b/vendor/github.com/Sirupsen/logrus/writer.go similarity index 100% rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/writer.go rename to vendor/github.com/Sirupsen/logrus/writer.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt b/vendor/github.com/aws/aws-sdk-go/LICENSE.txt similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt rename to vendor/github.com/aws/aws-sdk-go/LICENSE.txt diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt b/vendor/github.com/aws/aws-sdk-go/NOTICE.txt similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt rename to vendor/github.com/aws/aws-sdk-go/NOTICE.txt diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go b/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go rename to vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go b/vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go rename to vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal.go rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/client.go b/vendor/github.com/aws/aws-sdk-go/aws/client/client.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/client.go rename to vendor/github.com/aws/aws-sdk-go/aws/client/client.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/default_retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/default_retryer.go rename to vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go b/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go rename to vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go b/vendor/github.com/aws/aws-sdk-go/aws/config.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go rename to vendor/github.com/aws/aws-sdk-go/aws/config.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go b/vendor/github.com/aws/aws-sdk-go/aws/convert_types.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go rename to vendor/github.com/aws/aws-sdk-go/aws/convert_types.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go rename to vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go rename to vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini b/vendor/github.com/aws/aws-sdk-go/aws/credentials/example.ini similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/example.ini diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/defaults/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/defaults/defaults.go rename to vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go rename to vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go rename to vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go b/vendor/github.com/aws/aws-sdk-go/aws/errors.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go rename to vendor/github.com/aws/aws-sdk-go/aws/errors.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go b/vendor/github.com/aws/aws-sdk-go/aws/logger.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go rename to vendor/github.com/aws/aws-sdk-go/aws/logger.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go rename to vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go rename to vendor/github.com/aws/aws-sdk-go/aws/request/request.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination.go rename to vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go rename to vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/session/session.go b/vendor/github.com/aws/aws-sdk-go/aws/session/session.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/session/session.go rename to vendor/github.com/aws/aws-sdk-go/aws/session/session.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go b/vendor/github.com/aws/aws-sdk-go/aws/types.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go rename to vendor/github.com/aws/aws-sdk-go/aws/types.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go rename to vendor/github.com/aws/aws-sdk-go/aws/version.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints.go b/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints.go rename to vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json b/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json rename to vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go b/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go rename to vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/ec2query/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/build.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/ec2query/build.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/build.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/idempotency.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/idempotency.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/idempotency.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/idempotency.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/build.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/build.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/build.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/unmarshal.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/unmarshal.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/unmarshal.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/build.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/build.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/restjson/restjson.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/restjson/restjson.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/restjson/restjson.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/restjson/restjson.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/unmarshal.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/unmarshal.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/unmarshal.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go rename to vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go b/vendor/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go rename to vendor/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/v4.go b/vendor/github.com/aws/aws-sdk-go/private/signer/v4/v4.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/v4.go rename to vendor/github.com/aws/aws-sdk-go/private/signer/v4/v4.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/waiter/waiter.go b/vendor/github.com/aws/aws-sdk-go/private/waiter/waiter.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/waiter/waiter.go rename to vendor/github.com/aws/aws-sdk-go/private/waiter/waiter.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/cloudfront/sign/policy.go b/vendor/github.com/aws/aws-sdk-go/service/cloudfront/sign/policy.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/cloudfront/sign/policy.go rename to vendor/github.com/aws/aws-sdk-go/service/cloudfront/sign/policy.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/cloudfront/sign/privkey.go b/vendor/github.com/aws/aws-sdk-go/service/cloudfront/sign/privkey.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/cloudfront/sign/privkey.go rename to vendor/github.com/aws/aws-sdk-go/service/cloudfront/sign/privkey.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/cloudfront/sign/randomreader.go b/vendor/github.com/aws/aws-sdk-go/service/cloudfront/sign/randomreader.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/cloudfront/sign/randomreader.go rename to vendor/github.com/aws/aws-sdk-go/service/cloudfront/sign/randomreader.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/cloudfront/sign/sign_url.go b/vendor/github.com/aws/aws-sdk-go/service/cloudfront/sign/sign_url.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/cloudfront/sign/sign_url.go rename to vendor/github.com/aws/aws-sdk-go/service/cloudfront/sign/sign_url.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/api.go b/vendor/github.com/aws/aws-sdk-go/service/s3/api.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/api.go rename to vendor/github.com/aws/aws-sdk-go/service/s3/api.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/bucket_location.go b/vendor/github.com/aws/aws-sdk-go/service/s3/bucket_location.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/bucket_location.go rename to vendor/github.com/aws/aws-sdk-go/service/s3/bucket_location.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/content_md5.go b/vendor/github.com/aws/aws-sdk-go/service/s3/content_md5.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/content_md5.go rename to vendor/github.com/aws/aws-sdk-go/service/s3/content_md5.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/customizations.go b/vendor/github.com/aws/aws-sdk-go/service/s3/customizations.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/customizations.go rename to vendor/github.com/aws/aws-sdk-go/service/s3/customizations.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/host_style_bucket.go b/vendor/github.com/aws/aws-sdk-go/service/s3/host_style_bucket.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/host_style_bucket.go rename to vendor/github.com/aws/aws-sdk-go/service/s3/host_style_bucket.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3iface/interface.go b/vendor/github.com/aws/aws-sdk-go/service/s3/s3iface/interface.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3iface/interface.go rename to vendor/github.com/aws/aws-sdk-go/service/s3/s3iface/interface.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/doc.go b/vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/doc.go rename to vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/doc.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/download.go b/vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/download.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/download.go rename to vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/download.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/s3manageriface/interface.go b/vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/s3manageriface/interface.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/s3manageriface/interface.go rename to vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/s3manageriface/interface.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/upload.go b/vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/upload.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/upload.go rename to vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/upload.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/service.go b/vendor/github.com/aws/aws-sdk-go/service/s3/service.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/service.go rename to vendor/github.com/aws/aws-sdk-go/service/s3/service.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/sse.go b/vendor/github.com/aws/aws-sdk-go/service/s3/sse.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/sse.go rename to vendor/github.com/aws/aws-sdk-go/service/s3/sse.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/statusok_error.go b/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/statusok_error.go rename to vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/unmarshal_error.go b/vendor/github.com/aws/aws-sdk-go/service/s3/unmarshal_error.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/unmarshal_error.go rename to vendor/github.com/aws/aws-sdk-go/service/s3/unmarshal_error.go diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/waiters.go b/vendor/github.com/aws/aws-sdk-go/service/s3/waiters.go similarity index 100% rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/waiters.go rename to vendor/github.com/aws/aws-sdk-go/service/s3/waiters.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/.gitignore b/vendor/github.com/bradfitz/http2/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/.gitignore rename to vendor/github.com/bradfitz/http2/.gitignore diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/AUTHORS b/vendor/github.com/bradfitz/http2/AUTHORS similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/AUTHORS rename to vendor/github.com/bradfitz/http2/AUTHORS diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/CONTRIBUTORS b/vendor/github.com/bradfitz/http2/CONTRIBUTORS similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/CONTRIBUTORS rename to vendor/github.com/bradfitz/http2/CONTRIBUTORS diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/Dockerfile b/vendor/github.com/bradfitz/http2/Dockerfile similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/Dockerfile rename to vendor/github.com/bradfitz/http2/Dockerfile diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/HACKING b/vendor/github.com/bradfitz/http2/HACKING similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/HACKING rename to vendor/github.com/bradfitz/http2/HACKING diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/LICENSE b/vendor/github.com/bradfitz/http2/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/LICENSE rename to vendor/github.com/bradfitz/http2/LICENSE diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/Makefile b/vendor/github.com/bradfitz/http2/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/Makefile rename to vendor/github.com/bradfitz/http2/Makefile diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/README b/vendor/github.com/bradfitz/http2/README similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/README rename to vendor/github.com/bradfitz/http2/README diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/buffer.go b/vendor/github.com/bradfitz/http2/buffer.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/buffer.go rename to vendor/github.com/bradfitz/http2/buffer.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/buffer_test.go b/vendor/github.com/bradfitz/http2/buffer_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/buffer_test.go rename to vendor/github.com/bradfitz/http2/buffer_test.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/errors.go b/vendor/github.com/bradfitz/http2/errors.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/errors.go rename to vendor/github.com/bradfitz/http2/errors.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/errors_test.go b/vendor/github.com/bradfitz/http2/errors_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/errors_test.go rename to vendor/github.com/bradfitz/http2/errors_test.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/flow.go b/vendor/github.com/bradfitz/http2/flow.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/flow.go rename to vendor/github.com/bradfitz/http2/flow.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/flow_test.go b/vendor/github.com/bradfitz/http2/flow_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/flow_test.go rename to vendor/github.com/bradfitz/http2/flow_test.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/frame.go b/vendor/github.com/bradfitz/http2/frame.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/frame.go rename to vendor/github.com/bradfitz/http2/frame.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/frame_test.go b/vendor/github.com/bradfitz/http2/frame_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/frame_test.go rename to vendor/github.com/bradfitz/http2/frame_test.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/gotrack.go b/vendor/github.com/bradfitz/http2/gotrack.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/gotrack.go rename to vendor/github.com/bradfitz/http2/gotrack.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/gotrack_test.go b/vendor/github.com/bradfitz/http2/gotrack_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/gotrack_test.go rename to vendor/github.com/bradfitz/http2/gotrack_test.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/.gitignore b/vendor/github.com/bradfitz/http2/h2demo/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/.gitignore rename to vendor/github.com/bradfitz/http2/h2demo/.gitignore diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/Makefile b/vendor/github.com/bradfitz/http2/h2demo/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/Makefile rename to vendor/github.com/bradfitz/http2/h2demo/Makefile diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/README b/vendor/github.com/bradfitz/http2/h2demo/README similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/README rename to vendor/github.com/bradfitz/http2/h2demo/README diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/h2demo.go b/vendor/github.com/bradfitz/http2/h2demo/h2demo.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/h2demo.go rename to vendor/github.com/bradfitz/http2/h2demo/h2demo.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/launch.go b/vendor/github.com/bradfitz/http2/h2demo/launch.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/launch.go rename to vendor/github.com/bradfitz/http2/h2demo/launch.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/rootCA.key b/vendor/github.com/bradfitz/http2/h2demo/rootCA.key similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/rootCA.key rename to vendor/github.com/bradfitz/http2/h2demo/rootCA.key diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/rootCA.srl b/vendor/github.com/bradfitz/http2/h2demo/rootCA.srl similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/rootCA.srl rename to vendor/github.com/bradfitz/http2/h2demo/rootCA.srl diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/server.crt b/vendor/github.com/bradfitz/http2/h2demo/server.crt similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/server.crt rename to vendor/github.com/bradfitz/http2/h2demo/server.crt diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/server.key b/vendor/github.com/bradfitz/http2/h2demo/server.key similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/h2demo/server.key rename to vendor/github.com/bradfitz/http2/h2demo/server.key diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/h2i/README.md b/vendor/github.com/bradfitz/http2/h2i/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/h2i/README.md rename to vendor/github.com/bradfitz/http2/h2i/README.md diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/h2i/h2i.go b/vendor/github.com/bradfitz/http2/h2i/h2i.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/h2i/h2i.go rename to vendor/github.com/bradfitz/http2/h2i/h2i.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/headermap.go b/vendor/github.com/bradfitz/http2/headermap.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/headermap.go rename to vendor/github.com/bradfitz/http2/headermap.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/hpack/encode.go b/vendor/github.com/bradfitz/http2/hpack/encode.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/hpack/encode.go rename to vendor/github.com/bradfitz/http2/hpack/encode.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/hpack/encode_test.go b/vendor/github.com/bradfitz/http2/hpack/encode_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/hpack/encode_test.go rename to vendor/github.com/bradfitz/http2/hpack/encode_test.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/hpack/hpack.go b/vendor/github.com/bradfitz/http2/hpack/hpack.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/hpack/hpack.go rename to vendor/github.com/bradfitz/http2/hpack/hpack.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/hpack/hpack_test.go b/vendor/github.com/bradfitz/http2/hpack/hpack_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/hpack/hpack_test.go rename to vendor/github.com/bradfitz/http2/hpack/hpack_test.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/hpack/huffman.go b/vendor/github.com/bradfitz/http2/hpack/huffman.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/hpack/huffman.go rename to vendor/github.com/bradfitz/http2/hpack/huffman.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/hpack/tables.go b/vendor/github.com/bradfitz/http2/hpack/tables.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/hpack/tables.go rename to vendor/github.com/bradfitz/http2/hpack/tables.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/http2.go b/vendor/github.com/bradfitz/http2/http2.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/http2.go rename to vendor/github.com/bradfitz/http2/http2.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/http2_test.go b/vendor/github.com/bradfitz/http2/http2_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/http2_test.go rename to vendor/github.com/bradfitz/http2/http2_test.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/pipe.go b/vendor/github.com/bradfitz/http2/pipe.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/pipe.go rename to vendor/github.com/bradfitz/http2/pipe.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/pipe_test.go b/vendor/github.com/bradfitz/http2/pipe_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/pipe_test.go rename to vendor/github.com/bradfitz/http2/pipe_test.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/priority_test.go b/vendor/github.com/bradfitz/http2/priority_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/priority_test.go rename to vendor/github.com/bradfitz/http2/priority_test.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/server.go b/vendor/github.com/bradfitz/http2/server.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/server.go rename to vendor/github.com/bradfitz/http2/server.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/server_test.go b/vendor/github.com/bradfitz/http2/server_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/server_test.go rename to vendor/github.com/bradfitz/http2/server_test.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/testdata/draft-ietf-httpbis-http2.xml b/vendor/github.com/bradfitz/http2/testdata/draft-ietf-httpbis-http2.xml similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/testdata/draft-ietf-httpbis-http2.xml rename to vendor/github.com/bradfitz/http2/testdata/draft-ietf-httpbis-http2.xml diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/transport.go b/vendor/github.com/bradfitz/http2/transport.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/transport.go rename to vendor/github.com/bradfitz/http2/transport.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/transport_test.go b/vendor/github.com/bradfitz/http2/transport_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/transport_test.go rename to vendor/github.com/bradfitz/http2/transport_test.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/write.go b/vendor/github.com/bradfitz/http2/write.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/write.go rename to vendor/github.com/bradfitz/http2/write.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/writesched.go b/vendor/github.com/bradfitz/http2/writesched.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/writesched.go rename to vendor/github.com/bradfitz/http2/writesched.go diff --git a/Godeps/_workspace/src/github.com/bradfitz/http2/z_spec_test.go b/vendor/github.com/bradfitz/http2/z_spec_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bradfitz/http2/z_spec_test.go rename to vendor/github.com/bradfitz/http2/z_spec_test.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/.travis.yml b/vendor/github.com/bugsnag/bugsnag-go/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/.travis.yml rename to vendor/github.com/bugsnag/bugsnag-go/.travis.yml diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/LICENSE.txt b/vendor/github.com/bugsnag/bugsnag-go/LICENSE.txt similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/LICENSE.txt rename to vendor/github.com/bugsnag/bugsnag-go/LICENSE.txt diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/README.md b/vendor/github.com/bugsnag/bugsnag-go/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/README.md rename to vendor/github.com/bugsnag/bugsnag-go/README.md diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/appengine.go b/vendor/github.com/bugsnag/bugsnag-go/appengine.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/appengine.go rename to vendor/github.com/bugsnag/bugsnag-go/appengine.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/bugsnag.go b/vendor/github.com/bugsnag/bugsnag-go/bugsnag.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/bugsnag.go rename to vendor/github.com/bugsnag/bugsnag-go/bugsnag.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/bugsnag_test.go b/vendor/github.com/bugsnag/bugsnag-go/bugsnag_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/bugsnag_test.go rename to vendor/github.com/bugsnag/bugsnag-go/bugsnag_test.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/configuration.go b/vendor/github.com/bugsnag/bugsnag-go/configuration.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/configuration.go rename to vendor/github.com/bugsnag/bugsnag-go/configuration.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/configuration_test.go b/vendor/github.com/bugsnag/bugsnag-go/configuration_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/configuration_test.go rename to vendor/github.com/bugsnag/bugsnag-go/configuration_test.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/doc.go b/vendor/github.com/bugsnag/bugsnag-go/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/doc.go rename to vendor/github.com/bugsnag/bugsnag-go/doc.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/errors/README.md b/vendor/github.com/bugsnag/bugsnag-go/errors/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/errors/README.md rename to vendor/github.com/bugsnag/bugsnag-go/errors/README.md diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/errors/error.go b/vendor/github.com/bugsnag/bugsnag-go/errors/error.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/errors/error.go rename to vendor/github.com/bugsnag/bugsnag-go/errors/error.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/errors/error_test.go b/vendor/github.com/bugsnag/bugsnag-go/errors/error_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/errors/error_test.go rename to vendor/github.com/bugsnag/bugsnag-go/errors/error_test.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/errors/parse_panic.go b/vendor/github.com/bugsnag/bugsnag-go/errors/parse_panic.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/errors/parse_panic.go rename to vendor/github.com/bugsnag/bugsnag-go/errors/parse_panic.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/errors/parse_panic_test.go b/vendor/github.com/bugsnag/bugsnag-go/errors/parse_panic_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/errors/parse_panic_test.go rename to vendor/github.com/bugsnag/bugsnag-go/errors/parse_panic_test.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/errors/stackframe.go b/vendor/github.com/bugsnag/bugsnag-go/errors/stackframe.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/errors/stackframe.go rename to vendor/github.com/bugsnag/bugsnag-go/errors/stackframe.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/event.go b/vendor/github.com/bugsnag/bugsnag-go/event.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/event.go rename to vendor/github.com/bugsnag/bugsnag-go/event.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/json_tags.go b/vendor/github.com/bugsnag/bugsnag-go/json_tags.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/json_tags.go rename to vendor/github.com/bugsnag/bugsnag-go/json_tags.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/metadata.go b/vendor/github.com/bugsnag/bugsnag-go/metadata.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/metadata.go rename to vendor/github.com/bugsnag/bugsnag-go/metadata.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/metadata_test.go b/vendor/github.com/bugsnag/bugsnag-go/metadata_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/metadata_test.go rename to vendor/github.com/bugsnag/bugsnag-go/metadata_test.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/middleware.go b/vendor/github.com/bugsnag/bugsnag-go/middleware.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/middleware.go rename to vendor/github.com/bugsnag/bugsnag-go/middleware.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/middleware_test.go b/vendor/github.com/bugsnag/bugsnag-go/middleware_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/middleware_test.go rename to vendor/github.com/bugsnag/bugsnag-go/middleware_test.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/notifier.go b/vendor/github.com/bugsnag/bugsnag-go/notifier.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/notifier.go rename to vendor/github.com/bugsnag/bugsnag-go/notifier.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/panicwrap.go b/vendor/github.com/bugsnag/bugsnag-go/panicwrap.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/panicwrap.go rename to vendor/github.com/bugsnag/bugsnag-go/panicwrap.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/panicwrap_test.go b/vendor/github.com/bugsnag/bugsnag-go/panicwrap_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/panicwrap_test.go rename to vendor/github.com/bugsnag/bugsnag-go/panicwrap_test.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/payload.go b/vendor/github.com/bugsnag/bugsnag-go/payload.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/payload.go rename to vendor/github.com/bugsnag/bugsnag-go/payload.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/revel/bugsnagrevel.go b/vendor/github.com/bugsnag/bugsnag-go/revel/bugsnagrevel.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/bugsnag-go/revel/bugsnagrevel.go rename to vendor/github.com/bugsnag/bugsnag-go/revel/bugsnagrevel.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/osext/LICENSE b/vendor/github.com/bugsnag/osext/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/osext/LICENSE rename to vendor/github.com/bugsnag/osext/LICENSE diff --git a/Godeps/_workspace/src/github.com/bugsnag/osext/osext.go b/vendor/github.com/bugsnag/osext/osext.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/osext/osext.go rename to vendor/github.com/bugsnag/osext/osext.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/osext/osext_plan9.go b/vendor/github.com/bugsnag/osext/osext_plan9.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/osext/osext_plan9.go rename to vendor/github.com/bugsnag/osext/osext_plan9.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/osext/osext_procfs.go b/vendor/github.com/bugsnag/osext/osext_procfs.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/osext/osext_procfs.go rename to vendor/github.com/bugsnag/osext/osext_procfs.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/osext/osext_sysctl.go b/vendor/github.com/bugsnag/osext/osext_sysctl.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/osext/osext_sysctl.go rename to vendor/github.com/bugsnag/osext/osext_sysctl.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/osext/osext_test.go b/vendor/github.com/bugsnag/osext/osext_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/osext/osext_test.go rename to vendor/github.com/bugsnag/osext/osext_test.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/osext/osext_windows.go b/vendor/github.com/bugsnag/osext/osext_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/osext/osext_windows.go rename to vendor/github.com/bugsnag/osext/osext_windows.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/panicwrap/LICENSE b/vendor/github.com/bugsnag/panicwrap/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/panicwrap/LICENSE rename to vendor/github.com/bugsnag/panicwrap/LICENSE diff --git a/Godeps/_workspace/src/github.com/bugsnag/panicwrap/README.md b/vendor/github.com/bugsnag/panicwrap/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/panicwrap/README.md rename to vendor/github.com/bugsnag/panicwrap/README.md diff --git a/Godeps/_workspace/src/github.com/bugsnag/panicwrap/dup2.go b/vendor/github.com/bugsnag/panicwrap/dup2.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/panicwrap/dup2.go rename to vendor/github.com/bugsnag/panicwrap/dup2.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/panicwrap/dup3.go b/vendor/github.com/bugsnag/panicwrap/dup3.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/panicwrap/dup3.go rename to vendor/github.com/bugsnag/panicwrap/dup3.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/panicwrap/monitor.go b/vendor/github.com/bugsnag/panicwrap/monitor.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/panicwrap/monitor.go rename to vendor/github.com/bugsnag/panicwrap/monitor.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/panicwrap/monitor_windows.go b/vendor/github.com/bugsnag/panicwrap/monitor_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/panicwrap/monitor_windows.go rename to vendor/github.com/bugsnag/panicwrap/monitor_windows.go diff --git a/Godeps/_workspace/src/github.com/bugsnag/panicwrap/panicwrap.go b/vendor/github.com/bugsnag/panicwrap/panicwrap.go similarity index 100% rename from Godeps/_workspace/src/github.com/bugsnag/panicwrap/panicwrap.go rename to vendor/github.com/bugsnag/panicwrap/panicwrap.go diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/LICENSE.txt b/vendor/github.com/denverdino/aliyungo/LICENSE.txt similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/LICENSE.txt rename to vendor/github.com/denverdino/aliyungo/LICENSE.txt diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/common/client.go b/vendor/github.com/denverdino/aliyungo/common/client.go similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/common/client.go rename to vendor/github.com/denverdino/aliyungo/common/client.go diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/common/regions.go b/vendor/github.com/denverdino/aliyungo/common/regions.go similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/common/regions.go rename to vendor/github.com/denverdino/aliyungo/common/regions.go diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/common/request.go b/vendor/github.com/denverdino/aliyungo/common/request.go similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/common/request.go rename to vendor/github.com/denverdino/aliyungo/common/request.go diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/common/types.go b/vendor/github.com/denverdino/aliyungo/common/types.go similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/common/types.go rename to vendor/github.com/denverdino/aliyungo/common/types.go diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/common/version.go b/vendor/github.com/denverdino/aliyungo/common/version.go similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/common/version.go rename to vendor/github.com/denverdino/aliyungo/common/version.go diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/oss/client.go b/vendor/github.com/denverdino/aliyungo/oss/client.go similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/oss/client.go rename to vendor/github.com/denverdino/aliyungo/oss/client.go diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/oss/export.go b/vendor/github.com/denverdino/aliyungo/oss/export.go similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/oss/export.go rename to vendor/github.com/denverdino/aliyungo/oss/export.go diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/oss/multi.go b/vendor/github.com/denverdino/aliyungo/oss/multi.go similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/oss/multi.go rename to vendor/github.com/denverdino/aliyungo/oss/multi.go diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/oss/regions.go b/vendor/github.com/denverdino/aliyungo/oss/regions.go similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/oss/regions.go rename to vendor/github.com/denverdino/aliyungo/oss/regions.go diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/oss/signature.go b/vendor/github.com/denverdino/aliyungo/oss/signature.go similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/oss/signature.go rename to vendor/github.com/denverdino/aliyungo/oss/signature.go diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/util/attempt.go b/vendor/github.com/denverdino/aliyungo/util/attempt.go similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/util/attempt.go rename to vendor/github.com/denverdino/aliyungo/util/attempt.go diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/util/encoding.go b/vendor/github.com/denverdino/aliyungo/util/encoding.go similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/util/encoding.go rename to vendor/github.com/denverdino/aliyungo/util/encoding.go diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/util/iso6801.go b/vendor/github.com/denverdino/aliyungo/util/iso6801.go similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/util/iso6801.go rename to vendor/github.com/denverdino/aliyungo/util/iso6801.go diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/util/signature.go b/vendor/github.com/denverdino/aliyungo/util/signature.go similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/util/signature.go rename to vendor/github.com/denverdino/aliyungo/util/signature.go diff --git a/Godeps/_workspace/src/github.com/denverdino/aliyungo/util/util.go b/vendor/github.com/denverdino/aliyungo/util/util.go similarity index 100% rename from Godeps/_workspace/src/github.com/denverdino/aliyungo/util/util.go rename to vendor/github.com/denverdino/aliyungo/util/util.go diff --git a/Godeps/_workspace/src/github.com/docker/goamz/LICENSE b/vendor/github.com/docker/goamz/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/docker/goamz/LICENSE rename to vendor/github.com/docker/goamz/LICENSE diff --git a/Godeps/_workspace/src/github.com/docker/goamz/aws/attempt.go b/vendor/github.com/docker/goamz/aws/attempt.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/goamz/aws/attempt.go rename to vendor/github.com/docker/goamz/aws/attempt.go diff --git a/Godeps/_workspace/src/github.com/docker/goamz/aws/aws.go b/vendor/github.com/docker/goamz/aws/aws.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/goamz/aws/aws.go rename to vendor/github.com/docker/goamz/aws/aws.go diff --git a/Godeps/_workspace/src/github.com/docker/goamz/aws/client.go b/vendor/github.com/docker/goamz/aws/client.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/goamz/aws/client.go rename to vendor/github.com/docker/goamz/aws/client.go diff --git a/Godeps/_workspace/src/github.com/docker/goamz/aws/regions.go b/vendor/github.com/docker/goamz/aws/regions.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/goamz/aws/regions.go rename to vendor/github.com/docker/goamz/aws/regions.go diff --git a/Godeps/_workspace/src/github.com/docker/goamz/aws/retry.go b/vendor/github.com/docker/goamz/aws/retry.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/goamz/aws/retry.go rename to vendor/github.com/docker/goamz/aws/retry.go diff --git a/Godeps/_workspace/src/github.com/docker/goamz/aws/sign.go b/vendor/github.com/docker/goamz/aws/sign.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/goamz/aws/sign.go rename to vendor/github.com/docker/goamz/aws/sign.go diff --git a/Godeps/_workspace/src/github.com/docker/goamz/s3/lifecycle.go b/vendor/github.com/docker/goamz/s3/lifecycle.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/goamz/s3/lifecycle.go rename to vendor/github.com/docker/goamz/s3/lifecycle.go diff --git a/Godeps/_workspace/src/github.com/docker/goamz/s3/multi.go b/vendor/github.com/docker/goamz/s3/multi.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/goamz/s3/multi.go rename to vendor/github.com/docker/goamz/s3/multi.go diff --git a/Godeps/_workspace/src/github.com/docker/goamz/s3/s3.go b/vendor/github.com/docker/goamz/s3/s3.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/goamz/s3/s3.go rename to vendor/github.com/docker/goamz/s3/s3.go diff --git a/Godeps/_workspace/src/github.com/docker/goamz/s3/s3test/server.go b/vendor/github.com/docker/goamz/s3/s3test/server.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/goamz/s3/s3test/server.go rename to vendor/github.com/docker/goamz/s3/s3test/server.go diff --git a/Godeps/_workspace/src/github.com/docker/goamz/s3/sign.go b/vendor/github.com/docker/goamz/s3/sign.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/goamz/s3/sign.go rename to vendor/github.com/docker/goamz/s3/sign.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/CONTRIBUTING.md b/vendor/github.com/docker/libtrust/CONTRIBUTING.md similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/CONTRIBUTING.md rename to vendor/github.com/docker/libtrust/CONTRIBUTING.md diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/LICENSE b/vendor/github.com/docker/libtrust/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/LICENSE rename to vendor/github.com/docker/libtrust/LICENSE diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/MAINTAINERS b/vendor/github.com/docker/libtrust/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/MAINTAINERS rename to vendor/github.com/docker/libtrust/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/README.md b/vendor/github.com/docker/libtrust/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/README.md rename to vendor/github.com/docker/libtrust/README.md diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/certificates.go b/vendor/github.com/docker/libtrust/certificates.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/certificates.go rename to vendor/github.com/docker/libtrust/certificates.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/certificates_test.go b/vendor/github.com/docker/libtrust/certificates_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/certificates_test.go rename to vendor/github.com/docker/libtrust/certificates_test.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/doc.go b/vendor/github.com/docker/libtrust/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/doc.go rename to vendor/github.com/docker/libtrust/doc.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/ec_key.go b/vendor/github.com/docker/libtrust/ec_key.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/ec_key.go rename to vendor/github.com/docker/libtrust/ec_key.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/ec_key_test.go b/vendor/github.com/docker/libtrust/ec_key_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/ec_key_test.go rename to vendor/github.com/docker/libtrust/ec_key_test.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/filter.go b/vendor/github.com/docker/libtrust/filter.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/filter.go rename to vendor/github.com/docker/libtrust/filter.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/filter_test.go b/vendor/github.com/docker/libtrust/filter_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/filter_test.go rename to vendor/github.com/docker/libtrust/filter_test.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/hash.go b/vendor/github.com/docker/libtrust/hash.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/hash.go rename to vendor/github.com/docker/libtrust/hash.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/jsonsign.go b/vendor/github.com/docker/libtrust/jsonsign.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/jsonsign.go rename to vendor/github.com/docker/libtrust/jsonsign.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/jsonsign_test.go b/vendor/github.com/docker/libtrust/jsonsign_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/jsonsign_test.go rename to vendor/github.com/docker/libtrust/jsonsign_test.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/key.go b/vendor/github.com/docker/libtrust/key.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/key.go rename to vendor/github.com/docker/libtrust/key.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/key_files.go b/vendor/github.com/docker/libtrust/key_files.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/key_files.go rename to vendor/github.com/docker/libtrust/key_files.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/key_files_test.go b/vendor/github.com/docker/libtrust/key_files_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/key_files_test.go rename to vendor/github.com/docker/libtrust/key_files_test.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/key_manager.go b/vendor/github.com/docker/libtrust/key_manager.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/key_manager.go rename to vendor/github.com/docker/libtrust/key_manager.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/key_test.go b/vendor/github.com/docker/libtrust/key_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/key_test.go rename to vendor/github.com/docker/libtrust/key_test.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/rsa_key.go b/vendor/github.com/docker/libtrust/rsa_key.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/rsa_key.go rename to vendor/github.com/docker/libtrust/rsa_key.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/rsa_key_test.go b/vendor/github.com/docker/libtrust/rsa_key_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/rsa_key_test.go rename to vendor/github.com/docker/libtrust/rsa_key_test.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/testutil/certificates.go b/vendor/github.com/docker/libtrust/testutil/certificates.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/testutil/certificates.go rename to vendor/github.com/docker/libtrust/testutil/certificates.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/tlsdemo/README.md b/vendor/github.com/docker/libtrust/tlsdemo/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/tlsdemo/README.md rename to vendor/github.com/docker/libtrust/tlsdemo/README.md diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/tlsdemo/client.go b/vendor/github.com/docker/libtrust/tlsdemo/client.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/tlsdemo/client.go rename to vendor/github.com/docker/libtrust/tlsdemo/client.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/tlsdemo/gencert.go b/vendor/github.com/docker/libtrust/tlsdemo/gencert.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/tlsdemo/gencert.go rename to vendor/github.com/docker/libtrust/tlsdemo/gencert.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/tlsdemo/genkeys.go b/vendor/github.com/docker/libtrust/tlsdemo/genkeys.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/tlsdemo/genkeys.go rename to vendor/github.com/docker/libtrust/tlsdemo/genkeys.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/tlsdemo/server.go b/vendor/github.com/docker/libtrust/tlsdemo/server.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/tlsdemo/server.go rename to vendor/github.com/docker/libtrust/tlsdemo/server.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/trustgraph/graph.go b/vendor/github.com/docker/libtrust/trustgraph/graph.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/trustgraph/graph.go rename to vendor/github.com/docker/libtrust/trustgraph/graph.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/trustgraph/memory_graph.go b/vendor/github.com/docker/libtrust/trustgraph/memory_graph.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/trustgraph/memory_graph.go rename to vendor/github.com/docker/libtrust/trustgraph/memory_graph.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/trustgraph/memory_graph_test.go b/vendor/github.com/docker/libtrust/trustgraph/memory_graph_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/trustgraph/memory_graph_test.go rename to vendor/github.com/docker/libtrust/trustgraph/memory_graph_test.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/trustgraph/statement.go b/vendor/github.com/docker/libtrust/trustgraph/statement.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/trustgraph/statement.go rename to vendor/github.com/docker/libtrust/trustgraph/statement.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/trustgraph/statement_test.go b/vendor/github.com/docker/libtrust/trustgraph/statement_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/trustgraph/statement_test.go rename to vendor/github.com/docker/libtrust/trustgraph/statement_test.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/util.go b/vendor/github.com/docker/libtrust/util.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/util.go rename to vendor/github.com/docker/libtrust/util.go diff --git a/Godeps/_workspace/src/github.com/docker/libtrust/util_test.go b/vendor/github.com/docker/libtrust/util_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/libtrust/util_test.go rename to vendor/github.com/docker/libtrust/util_test.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/internal/commandinfo.go b/vendor/github.com/garyburd/redigo/internal/commandinfo.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/internal/commandinfo.go rename to vendor/github.com/garyburd/redigo/internal/commandinfo.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/internal/redistest/testdb.go b/vendor/github.com/garyburd/redigo/internal/redistest/testdb.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/internal/redistest/testdb.go rename to vendor/github.com/garyburd/redigo/internal/redistest/testdb.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/conn.go b/vendor/github.com/garyburd/redigo/redis/conn.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/conn.go rename to vendor/github.com/garyburd/redigo/redis/conn.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/conn_test.go b/vendor/github.com/garyburd/redigo/redis/conn_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/conn_test.go rename to vendor/github.com/garyburd/redigo/redis/conn_test.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/doc.go b/vendor/github.com/garyburd/redigo/redis/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/doc.go rename to vendor/github.com/garyburd/redigo/redis/doc.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/log.go b/vendor/github.com/garyburd/redigo/redis/log.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/log.go rename to vendor/github.com/garyburd/redigo/redis/log.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool.go b/vendor/github.com/garyburd/redigo/redis/pool.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool.go rename to vendor/github.com/garyburd/redigo/redis/pool.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool_test.go b/vendor/github.com/garyburd/redigo/redis/pool_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool_test.go rename to vendor/github.com/garyburd/redigo/redis/pool_test.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub.go b/vendor/github.com/garyburd/redigo/redis/pubsub.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub.go rename to vendor/github.com/garyburd/redigo/redis/pubsub.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub_test.go b/vendor/github.com/garyburd/redigo/redis/pubsub_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub_test.go rename to vendor/github.com/garyburd/redigo/redis/pubsub_test.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/redis.go b/vendor/github.com/garyburd/redigo/redis/redis.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/redis.go rename to vendor/github.com/garyburd/redigo/redis/redis.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply.go b/vendor/github.com/garyburd/redigo/redis/reply.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply.go rename to vendor/github.com/garyburd/redigo/redis/reply.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply_test.go b/vendor/github.com/garyburd/redigo/redis/reply_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply_test.go rename to vendor/github.com/garyburd/redigo/redis/reply_test.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/scan.go b/vendor/github.com/garyburd/redigo/redis/scan.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/scan.go rename to vendor/github.com/garyburd/redigo/redis/scan.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/scan_test.go b/vendor/github.com/garyburd/redigo/redis/scan_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/scan_test.go rename to vendor/github.com/garyburd/redigo/redis/scan_test.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/script.go b/vendor/github.com/garyburd/redigo/redis/script.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/script.go rename to vendor/github.com/garyburd/redigo/redis/script.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/script_test.go b/vendor/github.com/garyburd/redigo/redis/script_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/script_test.go rename to vendor/github.com/garyburd/redigo/redis/script_test.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/test_test.go b/vendor/github.com/garyburd/redigo/redis/test_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/test_test.go rename to vendor/github.com/garyburd/redigo/redis/test_test.go diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/zpop_example_test.go b/vendor/github.com/garyburd/redigo/redis/zpop_example_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/zpop_example_test.go rename to vendor/github.com/garyburd/redigo/redis/zpop_example_test.go diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/.gitignore b/vendor/github.com/go-ini/ini/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/go-ini/ini/.gitignore rename to vendor/github.com/go-ini/ini/.gitignore diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/LICENSE b/vendor/github.com/go-ini/ini/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/go-ini/ini/LICENSE rename to vendor/github.com/go-ini/ini/LICENSE diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/README.md b/vendor/github.com/go-ini/ini/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/go-ini/ini/README.md rename to vendor/github.com/go-ini/ini/README.md diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/README_ZH.md b/vendor/github.com/go-ini/ini/README_ZH.md similarity index 100% rename from Godeps/_workspace/src/github.com/go-ini/ini/README_ZH.md rename to vendor/github.com/go-ini/ini/README_ZH.md diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/ini.go b/vendor/github.com/go-ini/ini/ini.go similarity index 100% rename from Godeps/_workspace/src/github.com/go-ini/ini/ini.go rename to vendor/github.com/go-ini/ini/ini.go diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/parser.go b/vendor/github.com/go-ini/ini/parser.go similarity index 100% rename from Godeps/_workspace/src/github.com/go-ini/ini/parser.go rename to vendor/github.com/go-ini/ini/parser.go diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/struct.go b/vendor/github.com/go-ini/ini/struct.go similarity index 100% rename from Godeps/_workspace/src/github.com/go-ini/ini/struct.go rename to vendor/github.com/go-ini/ini/struct.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/.gitignore b/vendor/github.com/golang/protobuf/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/.gitignore rename to vendor/github.com/golang/protobuf/.gitignore diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/AUTHORS b/vendor/github.com/golang/protobuf/AUTHORS similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/AUTHORS rename to vendor/github.com/golang/protobuf/AUTHORS diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/CONTRIBUTORS b/vendor/github.com/golang/protobuf/CONTRIBUTORS similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/CONTRIBUTORS rename to vendor/github.com/golang/protobuf/CONTRIBUTORS diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE b/vendor/github.com/golang/protobuf/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/LICENSE rename to vendor/github.com/golang/protobuf/LICENSE diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/Make.protobuf b/vendor/github.com/golang/protobuf/Make.protobuf similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/Make.protobuf rename to vendor/github.com/golang/protobuf/Make.protobuf diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/Makefile b/vendor/github.com/golang/protobuf/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/Makefile rename to vendor/github.com/golang/protobuf/Makefile diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/README b/vendor/github.com/golang/protobuf/README similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/README rename to vendor/github.com/golang/protobuf/README diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/jsonpb/jsonpb.go b/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/jsonpb/jsonpb.go rename to vendor/github.com/golang/protobuf/jsonpb/jsonpb.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/jsonpb/jsonpb_test.go b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/jsonpb/jsonpb_test.go rename to vendor/github.com/golang/protobuf/jsonpb/jsonpb_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/Makefile b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/Makefile rename to vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/Makefile diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.proto b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.proto rename to vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.proto diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto rename to vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/Makefile b/vendor/github.com/golang/protobuf/proto/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/Makefile rename to vendor/github.com/golang/protobuf/proto/Makefile diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/all_test.go b/vendor/github.com/golang/protobuf/proto/all_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/all_test.go rename to vendor/github.com/golang/protobuf/proto/all_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone.go b/vendor/github.com/golang/protobuf/proto/clone.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/clone.go rename to vendor/github.com/golang/protobuf/proto/clone.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone_test.go b/vendor/github.com/golang/protobuf/proto/clone_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/clone_test.go rename to vendor/github.com/golang/protobuf/proto/clone_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/decode.go b/vendor/github.com/golang/protobuf/proto/decode.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/decode.go rename to vendor/github.com/golang/protobuf/proto/decode.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/encode.go b/vendor/github.com/golang/protobuf/proto/encode.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/encode.go rename to vendor/github.com/golang/protobuf/proto/encode.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal.go b/vendor/github.com/golang/protobuf/proto/equal.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/equal.go rename to vendor/github.com/golang/protobuf/proto/equal.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal_test.go b/vendor/github.com/golang/protobuf/proto/equal_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/equal_test.go rename to vendor/github.com/golang/protobuf/proto/equal_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions.go b/vendor/github.com/golang/protobuf/proto/extensions.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions.go rename to vendor/github.com/golang/protobuf/proto/extensions.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions_test.go b/vendor/github.com/golang/protobuf/proto/extensions_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions_test.go rename to vendor/github.com/golang/protobuf/proto/extensions_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/lib.go b/vendor/github.com/golang/protobuf/proto/lib.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/lib.go rename to vendor/github.com/golang/protobuf/proto/lib.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set.go b/vendor/github.com/golang/protobuf/proto/message_set.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set.go rename to vendor/github.com/golang/protobuf/proto/message_set.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set_test.go b/vendor/github.com/golang/protobuf/proto/message_set_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set_test.go rename to vendor/github.com/golang/protobuf/proto/message_set_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_reflect.go b/vendor/github.com/golang/protobuf/proto/pointer_reflect.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_reflect.go rename to vendor/github.com/golang/protobuf/proto/pointer_reflect.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_unsafe.go b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_unsafe.go rename to vendor/github.com/golang/protobuf/proto/pointer_unsafe.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/properties.go b/vendor/github.com/golang/protobuf/proto/properties.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/properties.go rename to vendor/github.com/golang/protobuf/proto/properties.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.proto b/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.proto rename to vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.proto diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_test.go b/vendor/github.com/golang/protobuf/proto/proto3_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_test.go rename to vendor/github.com/golang/protobuf/proto/proto3_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/size2_test.go b/vendor/github.com/golang/protobuf/proto/size2_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/size2_test.go rename to vendor/github.com/golang/protobuf/proto/size2_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/size_test.go b/vendor/github.com/golang/protobuf/proto/size_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/size_test.go rename to vendor/github.com/golang/protobuf/proto/size_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/Makefile b/vendor/github.com/golang/protobuf/proto/testdata/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/Makefile rename to vendor/github.com/golang/protobuf/proto/testdata/Makefile diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/golden_test.go b/vendor/github.com/golang/protobuf/proto/testdata/golden_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/golden_test.go rename to vendor/github.com/golang/protobuf/proto/testdata/golden_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/test.proto b/vendor/github.com/golang/protobuf/proto/testdata/test.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/test.proto rename to vendor/github.com/golang/protobuf/proto/testdata/test.proto diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text.go b/vendor/github.com/golang/protobuf/proto/text.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/text.go rename to vendor/github.com/golang/protobuf/proto/text.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser.go b/vendor/github.com/golang/protobuf/proto/text_parser.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser.go rename to vendor/github.com/golang/protobuf/proto/text_parser.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser_test.go b/vendor/github.com/golang/protobuf/proto/text_parser_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser_test.go rename to vendor/github.com/golang/protobuf/proto/text_parser_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_test.go b/vendor/github.com/golang/protobuf/proto/text_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/text_test.go rename to vendor/github.com/golang/protobuf/proto/text_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/Makefile b/vendor/github.com/golang/protobuf/protoc-gen-go/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/Makefile rename to vendor/github.com/golang/protobuf/protoc-gen-go/Makefile diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile rename to vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.golden b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.golden similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.golden rename to vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.golden diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/doc.go b/vendor/github.com/golang/protobuf/protoc-gen-go/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/doc.go rename to vendor/github.com/golang/protobuf/protoc-gen-go/doc.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/Makefile b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/Makefile rename to vendor/github.com/golang/protobuf/protoc-gen-go/generator/Makefile diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/generator.go b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/generator.go rename to vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/name_test.go b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/name_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/name_test.go rename to vendor/github.com/golang/protobuf/protoc-gen-go/generator/name_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go b/vendor/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go rename to vendor/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/link_grpc.go b/vendor/github.com/golang/protobuf/protoc-gen-go/link_grpc.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/link_grpc.go rename to vendor/github.com/golang/protobuf/protoc-gen-go/link_grpc.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/main.go b/vendor/github.com/golang/protobuf/protoc-gen-go/main.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/main.go rename to vendor/github.com/golang/protobuf/protoc-gen-go/main.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile b/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile rename to vendor/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.golden b/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.golden similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.golden rename to vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.golden diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/Makefile b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/Makefile rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/Makefile diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base.proto rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base.proto diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra.proto rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra.proto diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/extension_test.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/extension_test.go rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user.proto rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user.proto diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/golden_test.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/golden_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/golden_test.go rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/golden_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/grpc.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/grpc.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/grpc.proto rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/grpc.proto diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/imp.pb.go.golden b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.pb.go.golden similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/imp.pb.go.golden rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.pb.go.golden diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/imp.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/imp.proto rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.proto diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/imp2.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp2.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/imp2.proto rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp2.proto diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/imp3.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp3.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/imp3.proto rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp3.proto diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/main_test.go b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/main_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/main_test.go rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/main_test.go diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi1.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi1.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi1.proto rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi1.proto diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi2.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi2.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi2.proto rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi2.proto diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi3.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi3.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi3.proto rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi3.proto diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go.golden b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go.golden similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go.golden rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go.golden diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.proto rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.proto diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/proto3.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/proto3.proto similarity index 100% rename from Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/testdata/proto3.proto rename to vendor/github.com/golang/protobuf/protoc-gen-go/testdata/proto3.proto diff --git a/Godeps/_workspace/src/github.com/gorilla/context/.travis.yml b/vendor/github.com/gorilla/context/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/context/.travis.yml rename to vendor/github.com/gorilla/context/.travis.yml diff --git a/Godeps/_workspace/src/github.com/gorilla/context/LICENSE b/vendor/github.com/gorilla/context/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/context/LICENSE rename to vendor/github.com/gorilla/context/LICENSE diff --git a/Godeps/_workspace/src/github.com/gorilla/context/README.md b/vendor/github.com/gorilla/context/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/context/README.md rename to vendor/github.com/gorilla/context/README.md diff --git a/Godeps/_workspace/src/github.com/gorilla/context/context.go b/vendor/github.com/gorilla/context/context.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/context/context.go rename to vendor/github.com/gorilla/context/context.go diff --git a/Godeps/_workspace/src/github.com/gorilla/context/context_test.go b/vendor/github.com/gorilla/context/context_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/context/context_test.go rename to vendor/github.com/gorilla/context/context_test.go diff --git a/Godeps/_workspace/src/github.com/gorilla/context/doc.go b/vendor/github.com/gorilla/context/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/context/doc.go rename to vendor/github.com/gorilla/context/doc.go diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/.travis.yml b/vendor/github.com/gorilla/handlers/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/handlers/.travis.yml rename to vendor/github.com/gorilla/handlers/.travis.yml diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/LICENSE b/vendor/github.com/gorilla/handlers/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/handlers/LICENSE rename to vendor/github.com/gorilla/handlers/LICENSE diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/README.md b/vendor/github.com/gorilla/handlers/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/handlers/README.md rename to vendor/github.com/gorilla/handlers/README.md diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/canonical.go b/vendor/github.com/gorilla/handlers/canonical.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/handlers/canonical.go rename to vendor/github.com/gorilla/handlers/canonical.go diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/compress.go b/vendor/github.com/gorilla/handlers/compress.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/handlers/compress.go rename to vendor/github.com/gorilla/handlers/compress.go diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/compress_test.go b/vendor/github.com/gorilla/handlers/compress_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/handlers/compress_test.go rename to vendor/github.com/gorilla/handlers/compress_test.go diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/doc.go b/vendor/github.com/gorilla/handlers/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/handlers/doc.go rename to vendor/github.com/gorilla/handlers/doc.go diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/handlers.go b/vendor/github.com/gorilla/handlers/handlers.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/handlers/handlers.go rename to vendor/github.com/gorilla/handlers/handlers.go diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/handlers_test.go b/vendor/github.com/gorilla/handlers/handlers_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/handlers/handlers_test.go rename to vendor/github.com/gorilla/handlers/handlers_test.go diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/proxy_headers.go b/vendor/github.com/gorilla/handlers/proxy_headers.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/handlers/proxy_headers.go rename to vendor/github.com/gorilla/handlers/proxy_headers.go diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/.travis.yml b/vendor/github.com/gorilla/mux/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/mux/.travis.yml rename to vendor/github.com/gorilla/mux/.travis.yml diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/LICENSE b/vendor/github.com/gorilla/mux/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/mux/LICENSE rename to vendor/github.com/gorilla/mux/LICENSE diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/README.md b/vendor/github.com/gorilla/mux/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/mux/README.md rename to vendor/github.com/gorilla/mux/README.md diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/bench_test.go b/vendor/github.com/gorilla/mux/bench_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/mux/bench_test.go rename to vendor/github.com/gorilla/mux/bench_test.go diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/doc.go b/vendor/github.com/gorilla/mux/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/mux/doc.go rename to vendor/github.com/gorilla/mux/doc.go diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/mux.go b/vendor/github.com/gorilla/mux/mux.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/mux/mux.go rename to vendor/github.com/gorilla/mux/mux.go diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go b/vendor/github.com/gorilla/mux/mux_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go rename to vendor/github.com/gorilla/mux/mux_test.go diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/old_test.go b/vendor/github.com/gorilla/mux/old_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/mux/old_test.go rename to vendor/github.com/gorilla/mux/old_test.go diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/regexp.go b/vendor/github.com/gorilla/mux/regexp.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/mux/regexp.go rename to vendor/github.com/gorilla/mux/regexp.go diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/route.go b/vendor/github.com/gorilla/mux/route.go similarity index 100% rename from Godeps/_workspace/src/github.com/gorilla/mux/route.go rename to vendor/github.com/gorilla/mux/route.go diff --git a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/LICENSE b/vendor/github.com/inconshreveable/mousetrap/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/inconshreveable/mousetrap/LICENSE rename to vendor/github.com/inconshreveable/mousetrap/LICENSE diff --git a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/README.md b/vendor/github.com/inconshreveable/mousetrap/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/inconshreveable/mousetrap/README.md rename to vendor/github.com/inconshreveable/mousetrap/README.md diff --git a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_others.go b/vendor/github.com/inconshreveable/mousetrap/trap_others.go similarity index 100% rename from Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_others.go rename to vendor/github.com/inconshreveable/mousetrap/trap_others.go diff --git a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows.go b/vendor/github.com/inconshreveable/mousetrap/trap_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows.go rename to vendor/github.com/inconshreveable/mousetrap/trap_windows.go diff --git a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows_1.4.go b/vendor/github.com/inconshreveable/mousetrap/trap_windows_1.4.go similarity index 100% rename from Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows_1.4.go rename to vendor/github.com/inconshreveable/mousetrap/trap_windows_1.4.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.gitignore b/vendor/github.com/jmespath/go-jmespath/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/.gitignore rename to vendor/github.com/jmespath/go-jmespath/.gitignore diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.travis.yml b/vendor/github.com/jmespath/go-jmespath/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/.travis.yml rename to vendor/github.com/jmespath/go-jmespath/.travis.yml diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE b/vendor/github.com/jmespath/go-jmespath/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE rename to vendor/github.com/jmespath/go-jmespath/LICENSE diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/Makefile b/vendor/github.com/jmespath/go-jmespath/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/Makefile rename to vendor/github.com/jmespath/go-jmespath/Makefile diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/README.md b/vendor/github.com/jmespath/go-jmespath/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/README.md rename to vendor/github.com/jmespath/go-jmespath/README.md diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/api.go b/vendor/github.com/jmespath/go-jmespath/api.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/api.go rename to vendor/github.com/jmespath/go-jmespath/api.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/astnodetype_string.go b/vendor/github.com/jmespath/go-jmespath/astnodetype_string.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/astnodetype_string.go rename to vendor/github.com/jmespath/go-jmespath/astnodetype_string.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/basic.json b/vendor/github.com/jmespath/go-jmespath/compliance/basic.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/basic.json rename to vendor/github.com/jmespath/go-jmespath/compliance/basic.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/boolean.json b/vendor/github.com/jmespath/go-jmespath/compliance/boolean.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/boolean.json rename to vendor/github.com/jmespath/go-jmespath/compliance/boolean.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/current.json b/vendor/github.com/jmespath/go-jmespath/compliance/current.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/current.json rename to vendor/github.com/jmespath/go-jmespath/compliance/current.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/escape.json b/vendor/github.com/jmespath/go-jmespath/compliance/escape.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/escape.json rename to vendor/github.com/jmespath/go-jmespath/compliance/escape.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/filters.json b/vendor/github.com/jmespath/go-jmespath/compliance/filters.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/filters.json rename to vendor/github.com/jmespath/go-jmespath/compliance/filters.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/functions.json b/vendor/github.com/jmespath/go-jmespath/compliance/functions.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/functions.json rename to vendor/github.com/jmespath/go-jmespath/compliance/functions.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/identifiers.json b/vendor/github.com/jmespath/go-jmespath/compliance/identifiers.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/identifiers.json rename to vendor/github.com/jmespath/go-jmespath/compliance/identifiers.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/indices.json b/vendor/github.com/jmespath/go-jmespath/compliance/indices.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/indices.json rename to vendor/github.com/jmespath/go-jmespath/compliance/indices.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/literal.json b/vendor/github.com/jmespath/go-jmespath/compliance/literal.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/literal.json rename to vendor/github.com/jmespath/go-jmespath/compliance/literal.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/multiselect.json b/vendor/github.com/jmespath/go-jmespath/compliance/multiselect.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/multiselect.json rename to vendor/github.com/jmespath/go-jmespath/compliance/multiselect.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/ormatch.json b/vendor/github.com/jmespath/go-jmespath/compliance/ormatch.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/ormatch.json rename to vendor/github.com/jmespath/go-jmespath/compliance/ormatch.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/pipe.json b/vendor/github.com/jmespath/go-jmespath/compliance/pipe.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/pipe.json rename to vendor/github.com/jmespath/go-jmespath/compliance/pipe.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/slice.json b/vendor/github.com/jmespath/go-jmespath/compliance/slice.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/slice.json rename to vendor/github.com/jmespath/go-jmespath/compliance/slice.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/syntax.json b/vendor/github.com/jmespath/go-jmespath/compliance/syntax.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/syntax.json rename to vendor/github.com/jmespath/go-jmespath/compliance/syntax.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/unicode.json b/vendor/github.com/jmespath/go-jmespath/compliance/unicode.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/unicode.json rename to vendor/github.com/jmespath/go-jmespath/compliance/unicode.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/wildcard.json b/vendor/github.com/jmespath/go-jmespath/compliance/wildcard.json similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/wildcard.json rename to vendor/github.com/jmespath/go-jmespath/compliance/wildcard.json diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/functions.go b/vendor/github.com/jmespath/go-jmespath/functions.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/functions.go rename to vendor/github.com/jmespath/go-jmespath/functions.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/jmespath.go b/vendor/github.com/jmespath/go-jmespath/fuzz/jmespath.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/jmespath.go rename to vendor/github.com/jmespath/go-jmespath/fuzz/jmespath.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/interpreter.go b/vendor/github.com/jmespath/go-jmespath/interpreter.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/interpreter.go rename to vendor/github.com/jmespath/go-jmespath/interpreter.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/lexer.go b/vendor/github.com/jmespath/go-jmespath/lexer.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/lexer.go rename to vendor/github.com/jmespath/go-jmespath/lexer.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/parser.go b/vendor/github.com/jmespath/go-jmespath/parser.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/parser.go rename to vendor/github.com/jmespath/go-jmespath/parser.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/toktype_string.go b/vendor/github.com/jmespath/go-jmespath/toktype_string.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/toktype_string.go rename to vendor/github.com/jmespath/go-jmespath/toktype_string.go diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/util.go b/vendor/github.com/jmespath/go-jmespath/util.go similarity index 100% rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/util.go rename to vendor/github.com/jmespath/go-jmespath/util.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/.travis.yml b/vendor/github.com/mitchellh/mapstructure/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/.travis.yml rename to vendor/github.com/mitchellh/mapstructure/.travis.yml diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/LICENSE b/vendor/github.com/mitchellh/mapstructure/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/LICENSE rename to vendor/github.com/mitchellh/mapstructure/LICENSE diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/README.md b/vendor/github.com/mitchellh/mapstructure/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/README.md rename to vendor/github.com/mitchellh/mapstructure/README.md diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks.go b/vendor/github.com/mitchellh/mapstructure/decode_hooks.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks.go rename to vendor/github.com/mitchellh/mapstructure/decode_hooks.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks_test.go b/vendor/github.com/mitchellh/mapstructure/decode_hooks_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks_test.go rename to vendor/github.com/mitchellh/mapstructure/decode_hooks_test.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/error.go b/vendor/github.com/mitchellh/mapstructure/error.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/error.go rename to vendor/github.com/mitchellh/mapstructure/error.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure.go b/vendor/github.com/mitchellh/mapstructure/mapstructure.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure.go rename to vendor/github.com/mitchellh/mapstructure/mapstructure.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_benchmark_test.go b/vendor/github.com/mitchellh/mapstructure/mapstructure_benchmark_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_benchmark_test.go rename to vendor/github.com/mitchellh/mapstructure/mapstructure_benchmark_test.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_bugs_test.go b/vendor/github.com/mitchellh/mapstructure/mapstructure_bugs_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_bugs_test.go rename to vendor/github.com/mitchellh/mapstructure/mapstructure_bugs_test.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_examples_test.go b/vendor/github.com/mitchellh/mapstructure/mapstructure_examples_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_examples_test.go rename to vendor/github.com/mitchellh/mapstructure/mapstructure_examples_test.go diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_test.go b/vendor/github.com/mitchellh/mapstructure/mapstructure_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure_test.go rename to vendor/github.com/mitchellh/mapstructure/mapstructure_test.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/.gitignore b/vendor/github.com/ncw/swift/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/.gitignore rename to vendor/github.com/ncw/swift/.gitignore diff --git a/Godeps/_workspace/src/github.com/ncw/swift/.travis.yml b/vendor/github.com/ncw/swift/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/.travis.yml rename to vendor/github.com/ncw/swift/.travis.yml diff --git a/Godeps/_workspace/src/github.com/ncw/swift/COPYING b/vendor/github.com/ncw/swift/COPYING similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/COPYING rename to vendor/github.com/ncw/swift/COPYING diff --git a/Godeps/_workspace/src/github.com/ncw/swift/README.md b/vendor/github.com/ncw/swift/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/README.md rename to vendor/github.com/ncw/swift/README.md diff --git a/Godeps/_workspace/src/github.com/ncw/swift/auth.go b/vendor/github.com/ncw/swift/auth.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/auth.go rename to vendor/github.com/ncw/swift/auth.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/auth_v3.go b/vendor/github.com/ncw/swift/auth_v3.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/auth_v3.go rename to vendor/github.com/ncw/swift/auth_v3.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/compatibility_1_0.go b/vendor/github.com/ncw/swift/compatibility_1_0.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/compatibility_1_0.go rename to vendor/github.com/ncw/swift/compatibility_1_0.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/compatibility_1_1.go b/vendor/github.com/ncw/swift/compatibility_1_1.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/compatibility_1_1.go rename to vendor/github.com/ncw/swift/compatibility_1_1.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/doc.go b/vendor/github.com/ncw/swift/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/doc.go rename to vendor/github.com/ncw/swift/doc.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/example_test.go b/vendor/github.com/ncw/swift/example_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/example_test.go rename to vendor/github.com/ncw/swift/example_test.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/meta.go b/vendor/github.com/ncw/swift/meta.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/meta.go rename to vendor/github.com/ncw/swift/meta.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/meta_test.go b/vendor/github.com/ncw/swift/meta_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/meta_test.go rename to vendor/github.com/ncw/swift/meta_test.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/notes.txt b/vendor/github.com/ncw/swift/notes.txt similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/notes.txt rename to vendor/github.com/ncw/swift/notes.txt diff --git a/Godeps/_workspace/src/github.com/ncw/swift/rs/rs.go b/vendor/github.com/ncw/swift/rs/rs.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/rs/rs.go rename to vendor/github.com/ncw/swift/rs/rs.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/rs/rs_test.go b/vendor/github.com/ncw/swift/rs/rs_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/rs/rs_test.go rename to vendor/github.com/ncw/swift/rs/rs_test.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/swift.go b/vendor/github.com/ncw/swift/swift.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/swift.go rename to vendor/github.com/ncw/swift/swift.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/swift_internal_test.go b/vendor/github.com/ncw/swift/swift_internal_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/swift_internal_test.go rename to vendor/github.com/ncw/swift/swift_internal_test.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/swift_test.go b/vendor/github.com/ncw/swift/swift_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/swift_test.go rename to vendor/github.com/ncw/swift/swift_test.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/swifttest/server.go b/vendor/github.com/ncw/swift/swifttest/server.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/swifttest/server.go rename to vendor/github.com/ncw/swift/swifttest/server.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/timeout_reader.go b/vendor/github.com/ncw/swift/timeout_reader.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/timeout_reader.go rename to vendor/github.com/ncw/swift/timeout_reader.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/timeout_reader_test.go b/vendor/github.com/ncw/swift/timeout_reader_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/timeout_reader_test.go rename to vendor/github.com/ncw/swift/timeout_reader_test.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/watchdog_reader.go b/vendor/github.com/ncw/swift/watchdog_reader.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/watchdog_reader.go rename to vendor/github.com/ncw/swift/watchdog_reader.go diff --git a/Godeps/_workspace/src/github.com/ncw/swift/watchdog_reader_test.go b/vendor/github.com/ncw/swift/watchdog_reader_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/ncw/swift/watchdog_reader_test.go rename to vendor/github.com/ncw/swift/watchdog_reader_test.go diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/.gitignore b/vendor/github.com/spf13/cobra/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/cobra/.gitignore rename to vendor/github.com/spf13/cobra/.gitignore diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/.travis.yml b/vendor/github.com/spf13/cobra/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/cobra/.travis.yml rename to vendor/github.com/spf13/cobra/.travis.yml diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt b/vendor/github.com/spf13/cobra/LICENSE.txt similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt rename to vendor/github.com/spf13/cobra/LICENSE.txt diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/README.md b/vendor/github.com/spf13/cobra/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/cobra/README.md rename to vendor/github.com/spf13/cobra/README.md diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.go b/vendor/github.com/spf13/cobra/bash_completions.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.go rename to vendor/github.com/spf13/cobra/bash_completions.go diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.md b/vendor/github.com/spf13/cobra/bash_completions.md similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.md rename to vendor/github.com/spf13/cobra/bash_completions.md diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/bash_completions_test.go b/vendor/github.com/spf13/cobra/bash_completions_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/cobra/bash_completions_test.go rename to vendor/github.com/spf13/cobra/bash_completions_test.go diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra.go b/vendor/github.com/spf13/cobra/cobra.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/cobra/cobra.go rename to vendor/github.com/spf13/cobra/cobra.go diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra_test.go b/vendor/github.com/spf13/cobra/cobra_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/cobra/cobra_test.go rename to vendor/github.com/spf13/cobra/cobra_test.go diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/command.go b/vendor/github.com/spf13/cobra/command.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/cobra/command.go rename to vendor/github.com/spf13/cobra/command.go diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/command_test.go b/vendor/github.com/spf13/cobra/command_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/cobra/command_test.go rename to vendor/github.com/spf13/cobra/command_test.go diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/md_docs.go b/vendor/github.com/spf13/cobra/md_docs.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/cobra/md_docs.go rename to vendor/github.com/spf13/cobra/md_docs.go diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/md_docs.md b/vendor/github.com/spf13/cobra/md_docs.md similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/cobra/md_docs.md rename to vendor/github.com/spf13/cobra/md_docs.md diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/md_docs_test.go b/vendor/github.com/spf13/cobra/md_docs_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/cobra/md_docs_test.go rename to vendor/github.com/spf13/cobra/md_docs_test.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/.travis.yml b/vendor/github.com/spf13/pflag/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/.travis.yml rename to vendor/github.com/spf13/pflag/.travis.yml diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE b/vendor/github.com/spf13/pflag/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/LICENSE rename to vendor/github.com/spf13/pflag/LICENSE diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/README.md b/vendor/github.com/spf13/pflag/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/README.md rename to vendor/github.com/spf13/pflag/README.md diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/bool.go b/vendor/github.com/spf13/pflag/bool.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/bool.go rename to vendor/github.com/spf13/pflag/bool.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/bool_test.go b/vendor/github.com/spf13/pflag/bool_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/bool_test.go rename to vendor/github.com/spf13/pflag/bool_test.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/duration.go b/vendor/github.com/spf13/pflag/duration.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/duration.go rename to vendor/github.com/spf13/pflag/duration.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/example_test.go b/vendor/github.com/spf13/pflag/example_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/example_test.go rename to vendor/github.com/spf13/pflag/example_test.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/export_test.go b/vendor/github.com/spf13/pflag/export_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/export_test.go rename to vendor/github.com/spf13/pflag/export_test.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/flag.go b/vendor/github.com/spf13/pflag/flag.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/flag.go rename to vendor/github.com/spf13/pflag/flag.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/flag_test.go b/vendor/github.com/spf13/pflag/flag_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/flag_test.go rename to vendor/github.com/spf13/pflag/flag_test.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/float32.go b/vendor/github.com/spf13/pflag/float32.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/float32.go rename to vendor/github.com/spf13/pflag/float32.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/float64.go b/vendor/github.com/spf13/pflag/float64.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/float64.go rename to vendor/github.com/spf13/pflag/float64.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int.go b/vendor/github.com/spf13/pflag/int.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/int.go rename to vendor/github.com/spf13/pflag/int.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int32.go b/vendor/github.com/spf13/pflag/int32.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/int32.go rename to vendor/github.com/spf13/pflag/int32.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int64.go b/vendor/github.com/spf13/pflag/int64.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/int64.go rename to vendor/github.com/spf13/pflag/int64.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int8.go b/vendor/github.com/spf13/pflag/int8.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/int8.go rename to vendor/github.com/spf13/pflag/int8.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/ip.go b/vendor/github.com/spf13/pflag/ip.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/ip.go rename to vendor/github.com/spf13/pflag/ip.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go b/vendor/github.com/spf13/pflag/ipmask.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go rename to vendor/github.com/spf13/pflag/ipmask.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/string.go b/vendor/github.com/spf13/pflag/string.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/string.go rename to vendor/github.com/spf13/pflag/string.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint.go b/vendor/github.com/spf13/pflag/uint.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/uint.go rename to vendor/github.com/spf13/pflag/uint.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint16.go b/vendor/github.com/spf13/pflag/uint16.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/uint16.go rename to vendor/github.com/spf13/pflag/uint16.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint32.go b/vendor/github.com/spf13/pflag/uint32.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/uint32.go rename to vendor/github.com/spf13/pflag/uint32.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint64.go b/vendor/github.com/spf13/pflag/uint64.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/uint64.go rename to vendor/github.com/spf13/pflag/uint64.go diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint8.go b/vendor/github.com/spf13/pflag/uint8.go similarity index 100% rename from Godeps/_workspace/src/github.com/spf13/pflag/uint8.go rename to vendor/github.com/spf13/pflag/uint8.go diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/.gitignore b/vendor/github.com/stevvooe/resumable/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/.gitignore rename to vendor/github.com/stevvooe/resumable/.gitignore diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/LICENSE b/vendor/github.com/stevvooe/resumable/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/LICENSE rename to vendor/github.com/stevvooe/resumable/LICENSE diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/README.md b/vendor/github.com/stevvooe/resumable/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/README.md rename to vendor/github.com/stevvooe/resumable/README.md diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/resumable.go b/vendor/github.com/stevvooe/resumable/resumable.go similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/resumable.go rename to vendor/github.com/stevvooe/resumable/resumable.go diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/resume.go b/vendor/github.com/stevvooe/resumable/sha256/resume.go similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/resume.go rename to vendor/github.com/stevvooe/resumable/sha256/resume.go diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/sha256.go b/vendor/github.com/stevvooe/resumable/sha256/sha256.go similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/sha256.go rename to vendor/github.com/stevvooe/resumable/sha256/sha256.go diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/sha256_test.go b/vendor/github.com/stevvooe/resumable/sha256/sha256_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/sha256_test.go rename to vendor/github.com/stevvooe/resumable/sha256/sha256_test.go diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/sha256block.go b/vendor/github.com/stevvooe/resumable/sha256/sha256block.go similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/sha256block.go rename to vendor/github.com/stevvooe/resumable/sha256/sha256block.go diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/sha256block_386.s b/vendor/github.com/stevvooe/resumable/sha256/sha256block_386.s similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/sha256block_386.s rename to vendor/github.com/stevvooe/resumable/sha256/sha256block_386.s diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/sha256block_amd64.s b/vendor/github.com/stevvooe/resumable/sha256/sha256block_amd64.s similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/sha256block_amd64.s rename to vendor/github.com/stevvooe/resumable/sha256/sha256block_amd64.s diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/sha256block_decl.go b/vendor/github.com/stevvooe/resumable/sha256/sha256block_decl.go similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/sha256block_decl.go rename to vendor/github.com/stevvooe/resumable/sha256/sha256block_decl.go diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/sha256resume_test.go b/vendor/github.com/stevvooe/resumable/sha256/sha256resume_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/sha256/sha256resume_test.go rename to vendor/github.com/stevvooe/resumable/sha256/sha256resume_test.go diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/sha512/resume.go b/vendor/github.com/stevvooe/resumable/sha512/resume.go similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/sha512/resume.go rename to vendor/github.com/stevvooe/resumable/sha512/resume.go diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/sha512/sha512.go b/vendor/github.com/stevvooe/resumable/sha512/sha512.go similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/sha512/sha512.go rename to vendor/github.com/stevvooe/resumable/sha512/sha512.go diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/sha512/sha512_test.go b/vendor/github.com/stevvooe/resumable/sha512/sha512_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/sha512/sha512_test.go rename to vendor/github.com/stevvooe/resumable/sha512/sha512_test.go diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/sha512/sha512block.go b/vendor/github.com/stevvooe/resumable/sha512/sha512block.go similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/sha512/sha512block.go rename to vendor/github.com/stevvooe/resumable/sha512/sha512block.go diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/sha512/sha512block_amd64.s b/vendor/github.com/stevvooe/resumable/sha512/sha512block_amd64.s similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/sha512/sha512block_amd64.s rename to vendor/github.com/stevvooe/resumable/sha512/sha512block_amd64.s diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/sha512/sha512block_decl.go b/vendor/github.com/stevvooe/resumable/sha512/sha512block_decl.go similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/sha512/sha512block_decl.go rename to vendor/github.com/stevvooe/resumable/sha512/sha512block_decl.go diff --git a/Godeps/_workspace/src/github.com/stevvooe/resumable/sha512/sha512resume_test.go b/vendor/github.com/stevvooe/resumable/sha512/sha512resume_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/stevvooe/resumable/sha512/sha512resume_test.go rename to vendor/github.com/stevvooe/resumable/sha512/sha512resume_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/.gitignore b/vendor/github.com/yvasiyarov/go-metrics/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/.gitignore rename to vendor/github.com/yvasiyarov/go-metrics/.gitignore diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/LICENSE b/vendor/github.com/yvasiyarov/go-metrics/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/LICENSE rename to vendor/github.com/yvasiyarov/go-metrics/LICENSE diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/README.md b/vendor/github.com/yvasiyarov/go-metrics/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/README.md rename to vendor/github.com/yvasiyarov/go-metrics/README.md diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/cmd/metrics-bench/metrics-bench.go b/vendor/github.com/yvasiyarov/go-metrics/cmd/metrics-bench/metrics-bench.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/cmd/metrics-bench/metrics-bench.go rename to vendor/github.com/yvasiyarov/go-metrics/cmd/metrics-bench/metrics-bench.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/cmd/metrics-example/metrics-example.go b/vendor/github.com/yvasiyarov/go-metrics/cmd/metrics-example/metrics-example.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/cmd/metrics-example/metrics-example.go rename to vendor/github.com/yvasiyarov/go-metrics/cmd/metrics-example/metrics-example.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/cmd/never-read/never-read.go b/vendor/github.com/yvasiyarov/go-metrics/cmd/never-read/never-read.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/cmd/never-read/never-read.go rename to vendor/github.com/yvasiyarov/go-metrics/cmd/never-read/never-read.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/counter.go b/vendor/github.com/yvasiyarov/go-metrics/counter.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/counter.go rename to vendor/github.com/yvasiyarov/go-metrics/counter.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/counter_test.go b/vendor/github.com/yvasiyarov/go-metrics/counter_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/counter_test.go rename to vendor/github.com/yvasiyarov/go-metrics/counter_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/debug.go b/vendor/github.com/yvasiyarov/go-metrics/debug.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/debug.go rename to vendor/github.com/yvasiyarov/go-metrics/debug.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/debug_test.go b/vendor/github.com/yvasiyarov/go-metrics/debug_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/debug_test.go rename to vendor/github.com/yvasiyarov/go-metrics/debug_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/ewma.go b/vendor/github.com/yvasiyarov/go-metrics/ewma.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/ewma.go rename to vendor/github.com/yvasiyarov/go-metrics/ewma.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/ewma_test.go b/vendor/github.com/yvasiyarov/go-metrics/ewma_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/ewma_test.go rename to vendor/github.com/yvasiyarov/go-metrics/ewma_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/gauge.go b/vendor/github.com/yvasiyarov/go-metrics/gauge.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/gauge.go rename to vendor/github.com/yvasiyarov/go-metrics/gauge.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/gauge_float64.go b/vendor/github.com/yvasiyarov/go-metrics/gauge_float64.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/gauge_float64.go rename to vendor/github.com/yvasiyarov/go-metrics/gauge_float64.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/gauge_float64_test.go b/vendor/github.com/yvasiyarov/go-metrics/gauge_float64_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/gauge_float64_test.go rename to vendor/github.com/yvasiyarov/go-metrics/gauge_float64_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/gauge_test.go b/vendor/github.com/yvasiyarov/go-metrics/gauge_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/gauge_test.go rename to vendor/github.com/yvasiyarov/go-metrics/gauge_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/graphite.go b/vendor/github.com/yvasiyarov/go-metrics/graphite.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/graphite.go rename to vendor/github.com/yvasiyarov/go-metrics/graphite.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/graphite_test.go b/vendor/github.com/yvasiyarov/go-metrics/graphite_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/graphite_test.go rename to vendor/github.com/yvasiyarov/go-metrics/graphite_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/healthcheck.go b/vendor/github.com/yvasiyarov/go-metrics/healthcheck.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/healthcheck.go rename to vendor/github.com/yvasiyarov/go-metrics/healthcheck.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/histogram.go b/vendor/github.com/yvasiyarov/go-metrics/histogram.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/histogram.go rename to vendor/github.com/yvasiyarov/go-metrics/histogram.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/histogram_test.go b/vendor/github.com/yvasiyarov/go-metrics/histogram_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/histogram_test.go rename to vendor/github.com/yvasiyarov/go-metrics/histogram_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/influxdb/influxdb.go b/vendor/github.com/yvasiyarov/go-metrics/influxdb/influxdb.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/influxdb/influxdb.go rename to vendor/github.com/yvasiyarov/go-metrics/influxdb/influxdb.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/json.go b/vendor/github.com/yvasiyarov/go-metrics/json.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/json.go rename to vendor/github.com/yvasiyarov/go-metrics/json.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/json_test.go b/vendor/github.com/yvasiyarov/go-metrics/json_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/json_test.go rename to vendor/github.com/yvasiyarov/go-metrics/json_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/librato/client.go b/vendor/github.com/yvasiyarov/go-metrics/librato/client.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/librato/client.go rename to vendor/github.com/yvasiyarov/go-metrics/librato/client.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/librato/librato.go b/vendor/github.com/yvasiyarov/go-metrics/librato/librato.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/librato/librato.go rename to vendor/github.com/yvasiyarov/go-metrics/librato/librato.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/log.go b/vendor/github.com/yvasiyarov/go-metrics/log.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/log.go rename to vendor/github.com/yvasiyarov/go-metrics/log.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/memory.md b/vendor/github.com/yvasiyarov/go-metrics/memory.md similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/memory.md rename to vendor/github.com/yvasiyarov/go-metrics/memory.md diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/meter.go b/vendor/github.com/yvasiyarov/go-metrics/meter.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/meter.go rename to vendor/github.com/yvasiyarov/go-metrics/meter.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/meter_test.go b/vendor/github.com/yvasiyarov/go-metrics/meter_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/meter_test.go rename to vendor/github.com/yvasiyarov/go-metrics/meter_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/metrics.go b/vendor/github.com/yvasiyarov/go-metrics/metrics.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/metrics.go rename to vendor/github.com/yvasiyarov/go-metrics/metrics.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/metrics_test.go b/vendor/github.com/yvasiyarov/go-metrics/metrics_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/metrics_test.go rename to vendor/github.com/yvasiyarov/go-metrics/metrics_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/opentsdb.go b/vendor/github.com/yvasiyarov/go-metrics/opentsdb.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/opentsdb.go rename to vendor/github.com/yvasiyarov/go-metrics/opentsdb.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/opentsdb_test.go b/vendor/github.com/yvasiyarov/go-metrics/opentsdb_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/opentsdb_test.go rename to vendor/github.com/yvasiyarov/go-metrics/opentsdb_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/registry.go b/vendor/github.com/yvasiyarov/go-metrics/registry.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/registry.go rename to vendor/github.com/yvasiyarov/go-metrics/registry.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/registry_test.go b/vendor/github.com/yvasiyarov/go-metrics/registry_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/registry_test.go rename to vendor/github.com/yvasiyarov/go-metrics/registry_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/runtime.go b/vendor/github.com/yvasiyarov/go-metrics/runtime.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/runtime.go rename to vendor/github.com/yvasiyarov/go-metrics/runtime.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/runtime_cgo.go b/vendor/github.com/yvasiyarov/go-metrics/runtime_cgo.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/runtime_cgo.go rename to vendor/github.com/yvasiyarov/go-metrics/runtime_cgo.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/runtime_no_cgo.go b/vendor/github.com/yvasiyarov/go-metrics/runtime_no_cgo.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/runtime_no_cgo.go rename to vendor/github.com/yvasiyarov/go-metrics/runtime_no_cgo.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/runtime_test.go b/vendor/github.com/yvasiyarov/go-metrics/runtime_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/runtime_test.go rename to vendor/github.com/yvasiyarov/go-metrics/runtime_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/sample.go b/vendor/github.com/yvasiyarov/go-metrics/sample.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/sample.go rename to vendor/github.com/yvasiyarov/go-metrics/sample.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/sample_test.go b/vendor/github.com/yvasiyarov/go-metrics/sample_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/sample_test.go rename to vendor/github.com/yvasiyarov/go-metrics/sample_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/stathat/stathat.go b/vendor/github.com/yvasiyarov/go-metrics/stathat/stathat.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/stathat/stathat.go rename to vendor/github.com/yvasiyarov/go-metrics/stathat/stathat.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/syslog.go b/vendor/github.com/yvasiyarov/go-metrics/syslog.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/syslog.go rename to vendor/github.com/yvasiyarov/go-metrics/syslog.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/timer.go b/vendor/github.com/yvasiyarov/go-metrics/timer.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/timer.go rename to vendor/github.com/yvasiyarov/go-metrics/timer.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/timer_test.go b/vendor/github.com/yvasiyarov/go-metrics/timer_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/timer_test.go rename to vendor/github.com/yvasiyarov/go-metrics/timer_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/writer.go b/vendor/github.com/yvasiyarov/go-metrics/writer.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/writer.go rename to vendor/github.com/yvasiyarov/go-metrics/writer.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/writer_test.go b/vendor/github.com/yvasiyarov/go-metrics/writer_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/go-metrics/writer_test.go rename to vendor/github.com/yvasiyarov/go-metrics/writer_test.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/gorelic/.gitignore b/vendor/github.com/yvasiyarov/gorelic/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/gorelic/.gitignore rename to vendor/github.com/yvasiyarov/gorelic/.gitignore diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/gorelic/.travis.yml b/vendor/github.com/yvasiyarov/gorelic/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/gorelic/.travis.yml rename to vendor/github.com/yvasiyarov/gorelic/.travis.yml diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/gorelic/LICENSE b/vendor/github.com/yvasiyarov/gorelic/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/gorelic/LICENSE rename to vendor/github.com/yvasiyarov/gorelic/LICENSE diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/gorelic/README.md b/vendor/github.com/yvasiyarov/gorelic/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/gorelic/README.md rename to vendor/github.com/yvasiyarov/gorelic/README.md diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/gorelic/agent.go b/vendor/github.com/yvasiyarov/gorelic/agent.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/gorelic/agent.go rename to vendor/github.com/yvasiyarov/gorelic/agent.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/gorelic/doc.go b/vendor/github.com/yvasiyarov/gorelic/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/gorelic/doc.go rename to vendor/github.com/yvasiyarov/gorelic/doc.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/gorelic/examples/example1.go b/vendor/github.com/yvasiyarov/gorelic/examples/example1.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/gorelic/examples/example1.go rename to vendor/github.com/yvasiyarov/gorelic/examples/example1.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/gorelic/examples/example_web.go b/vendor/github.com/yvasiyarov/gorelic/examples/example_web.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/gorelic/examples/example_web.go rename to vendor/github.com/yvasiyarov/gorelic/examples/example_web.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/gorelic/gc_metrics.go b/vendor/github.com/yvasiyarov/gorelic/gc_metrics.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/gorelic/gc_metrics.go rename to vendor/github.com/yvasiyarov/gorelic/gc_metrics.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/gorelic/gometrica.go b/vendor/github.com/yvasiyarov/gorelic/gometrica.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/gorelic/gometrica.go rename to vendor/github.com/yvasiyarov/gorelic/gometrica.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/gorelic/http_metrics.go b/vendor/github.com/yvasiyarov/gorelic/http_metrics.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/gorelic/http_metrics.go rename to vendor/github.com/yvasiyarov/gorelic/http_metrics.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/gorelic/memory_metrics.go b/vendor/github.com/yvasiyarov/gorelic/memory_metrics.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/gorelic/memory_metrics.go rename to vendor/github.com/yvasiyarov/gorelic/memory_metrics.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/gorelic/nut.json b/vendor/github.com/yvasiyarov/gorelic/nut.json similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/gorelic/nut.json rename to vendor/github.com/yvasiyarov/gorelic/nut.json diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/gorelic/runtime_metrics.go b/vendor/github.com/yvasiyarov/gorelic/runtime_metrics.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/gorelic/runtime_metrics.go rename to vendor/github.com/yvasiyarov/gorelic/runtime_metrics.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/.travis.yml b/vendor/github.com/yvasiyarov/newrelic_platform_go/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/.travis.yml rename to vendor/github.com/yvasiyarov/newrelic_platform_go/.travis.yml diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/LICENSE b/vendor/github.com/yvasiyarov/newrelic_platform_go/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/LICENSE rename to vendor/github.com/yvasiyarov/newrelic_platform_go/LICENSE diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/README.md b/vendor/github.com/yvasiyarov/newrelic_platform_go/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/README.md rename to vendor/github.com/yvasiyarov/newrelic_platform_go/README.md diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/agent.go b/vendor/github.com/yvasiyarov/newrelic_platform_go/agent.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/agent.go rename to vendor/github.com/yvasiyarov/newrelic_platform_go/agent.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/component.go b/vendor/github.com/yvasiyarov/newrelic_platform_go/component.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/component.go rename to vendor/github.com/yvasiyarov/newrelic_platform_go/component.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/doc.go b/vendor/github.com/yvasiyarov/newrelic_platform_go/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/doc.go rename to vendor/github.com/yvasiyarov/newrelic_platform_go/doc.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/examples/wave_plugin.go b/vendor/github.com/yvasiyarov/newrelic_platform_go/examples/wave_plugin.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/examples/wave_plugin.go rename to vendor/github.com/yvasiyarov/newrelic_platform_go/examples/wave_plugin.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/metrica.go b/vendor/github.com/yvasiyarov/newrelic_platform_go/metrica.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/metrica.go rename to vendor/github.com/yvasiyarov/newrelic_platform_go/metrica.go diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/nut.json b/vendor/github.com/yvasiyarov/newrelic_platform_go/nut.json similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/nut.json rename to vendor/github.com/yvasiyarov/newrelic_platform_go/nut.json diff --git a/Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/plugin.go b/vendor/github.com/yvasiyarov/newrelic_platform_go/plugin.go similarity index 100% rename from Godeps/_workspace/src/github.com/yvasiyarov/newrelic_platform_go/plugin.go rename to vendor/github.com/yvasiyarov/newrelic_platform_go/plugin.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/LICENSE b/vendor/golang.org/x/crypto/LICENSE similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/LICENSE rename to vendor/golang.org/x/crypto/LICENSE diff --git a/Godeps/_workspace/src/golang.org/x/crypto/PATENTS b/vendor/golang.org/x/crypto/PATENTS similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/PATENTS rename to vendor/golang.org/x/crypto/PATENTS diff --git a/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/base64.go b/vendor/golang.org/x/crypto/bcrypt/base64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/bcrypt/base64.go rename to vendor/golang.org/x/crypto/bcrypt/base64.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt.go b/vendor/golang.org/x/crypto/bcrypt/bcrypt.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt.go rename to vendor/golang.org/x/crypto/bcrypt/bcrypt.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt_test.go b/vendor/golang.org/x/crypto/bcrypt/bcrypt_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt_test.go rename to vendor/golang.org/x/crypto/bcrypt/bcrypt_test.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/blowfish/block.go b/vendor/golang.org/x/crypto/blowfish/block.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/blowfish/block.go rename to vendor/golang.org/x/crypto/blowfish/block.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/blowfish/blowfish_test.go b/vendor/golang.org/x/crypto/blowfish/blowfish_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/blowfish/blowfish_test.go rename to vendor/golang.org/x/crypto/blowfish/blowfish_test.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/blowfish/cipher.go b/vendor/golang.org/x/crypto/blowfish/cipher.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/blowfish/cipher.go rename to vendor/golang.org/x/crypto/blowfish/cipher.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/blowfish/const.go b/vendor/golang.org/x/crypto/blowfish/const.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/blowfish/const.go rename to vendor/golang.org/x/crypto/blowfish/const.go diff --git a/Godeps/_workspace/src/golang.org/x/net/LICENSE b/vendor/golang.org/x/net/LICENSE similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/LICENSE rename to vendor/golang.org/x/net/LICENSE diff --git a/Godeps/_workspace/src/golang.org/x/net/PATENTS b/vendor/golang.org/x/net/PATENTS similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/PATENTS rename to vendor/golang.org/x/net/PATENTS diff --git a/Godeps/_workspace/src/golang.org/x/net/context/context.go b/vendor/golang.org/x/net/context/context.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/context/context.go rename to vendor/golang.org/x/net/context/context.go diff --git a/Godeps/_workspace/src/golang.org/x/net/context/context_test.go b/vendor/golang.org/x/net/context/context_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/context/context_test.go rename to vendor/golang.org/x/net/context/context_test.go diff --git a/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq.go b/vendor/golang.org/x/net/context/ctxhttp/cancelreq.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq.go rename to vendor/golang.org/x/net/context/ctxhttp/cancelreq.go diff --git a/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq_go14.go b/vendor/golang.org/x/net/context/ctxhttp/cancelreq_go14.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq_go14.go rename to vendor/golang.org/x/net/context/ctxhttp/cancelreq_go14.go diff --git a/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/ctxhttp.go b/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/ctxhttp.go rename to vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go diff --git a/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/ctxhttp_test.go b/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/ctxhttp_test.go rename to vendor/golang.org/x/net/context/ctxhttp/ctxhttp_test.go diff --git a/Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go b/vendor/golang.org/x/net/context/withtimeout_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go rename to vendor/golang.org/x/net/context/withtimeout_test.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/iana/const.go b/vendor/golang.org/x/net/internal/iana/const.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/iana/const.go rename to vendor/golang.org/x/net/internal/iana/const.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/iana/gen.go b/vendor/golang.org/x/net/internal/iana/gen.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/iana/gen.go rename to vendor/golang.org/x/net/internal/iana/gen.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/nettest/error_posix.go b/vendor/golang.org/x/net/internal/nettest/error_posix.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/nettest/error_posix.go rename to vendor/golang.org/x/net/internal/nettest/error_posix.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/nettest/error_stub.go b/vendor/golang.org/x/net/internal/nettest/error_stub.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/nettest/error_stub.go rename to vendor/golang.org/x/net/internal/nettest/error_stub.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/nettest/interface.go b/vendor/golang.org/x/net/internal/nettest/interface.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/nettest/interface.go rename to vendor/golang.org/x/net/internal/nettest/interface.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/nettest/rlimit.go b/vendor/golang.org/x/net/internal/nettest/rlimit.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/nettest/rlimit.go rename to vendor/golang.org/x/net/internal/nettest/rlimit.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/nettest/rlimit_stub.go b/vendor/golang.org/x/net/internal/nettest/rlimit_stub.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/nettest/rlimit_stub.go rename to vendor/golang.org/x/net/internal/nettest/rlimit_stub.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/nettest/rlimit_unix.go b/vendor/golang.org/x/net/internal/nettest/rlimit_unix.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/nettest/rlimit_unix.go rename to vendor/golang.org/x/net/internal/nettest/rlimit_unix.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/nettest/rlimit_windows.go b/vendor/golang.org/x/net/internal/nettest/rlimit_windows.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/nettest/rlimit_windows.go rename to vendor/golang.org/x/net/internal/nettest/rlimit_windows.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/nettest/stack.go b/vendor/golang.org/x/net/internal/nettest/stack.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/nettest/stack.go rename to vendor/golang.org/x/net/internal/nettest/stack.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/nettest/stack_stub.go b/vendor/golang.org/x/net/internal/nettest/stack_stub.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/nettest/stack_stub.go rename to vendor/golang.org/x/net/internal/nettest/stack_stub.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/nettest/stack_unix.go b/vendor/golang.org/x/net/internal/nettest/stack_unix.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/nettest/stack_unix.go rename to vendor/golang.org/x/net/internal/nettest/stack_unix.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/nettest/stack_windows.go b/vendor/golang.org/x/net/internal/nettest/stack_windows.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/nettest/stack_windows.go rename to vendor/golang.org/x/net/internal/nettest/stack_windows.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/timeseries/timeseries.go b/vendor/golang.org/x/net/internal/timeseries/timeseries.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/timeseries/timeseries.go rename to vendor/golang.org/x/net/internal/timeseries/timeseries.go diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/timeseries/timeseries_test.go b/vendor/golang.org/x/net/internal/timeseries/timeseries_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/internal/timeseries/timeseries_test.go rename to vendor/golang.org/x/net/internal/timeseries/timeseries_test.go diff --git a/Godeps/_workspace/src/golang.org/x/net/trace/events.go b/vendor/golang.org/x/net/trace/events.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/trace/events.go rename to vendor/golang.org/x/net/trace/events.go diff --git a/Godeps/_workspace/src/golang.org/x/net/trace/histogram.go b/vendor/golang.org/x/net/trace/histogram.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/trace/histogram.go rename to vendor/golang.org/x/net/trace/histogram.go diff --git a/Godeps/_workspace/src/golang.org/x/net/trace/histogram_test.go b/vendor/golang.org/x/net/trace/histogram_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/trace/histogram_test.go rename to vendor/golang.org/x/net/trace/histogram_test.go diff --git a/Godeps/_workspace/src/golang.org/x/net/trace/trace.go b/vendor/golang.org/x/net/trace/trace.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/trace/trace.go rename to vendor/golang.org/x/net/trace/trace.go diff --git a/Godeps/_workspace/src/golang.org/x/net/trace/trace_test.go b/vendor/golang.org/x/net/trace/trace_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/trace/trace_test.go rename to vendor/golang.org/x/net/trace/trace_test.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/.travis.yml b/vendor/golang.org/x/oauth2/.travis.yml similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/.travis.yml rename to vendor/golang.org/x/oauth2/.travis.yml diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/AUTHORS b/vendor/golang.org/x/oauth2/AUTHORS similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/AUTHORS rename to vendor/golang.org/x/oauth2/AUTHORS diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/CONTRIBUTING.md b/vendor/golang.org/x/oauth2/CONTRIBUTING.md similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/CONTRIBUTING.md rename to vendor/golang.org/x/oauth2/CONTRIBUTING.md diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/CONTRIBUTORS b/vendor/golang.org/x/oauth2/CONTRIBUTORS similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/CONTRIBUTORS rename to vendor/golang.org/x/oauth2/CONTRIBUTORS diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/LICENSE b/vendor/golang.org/x/oauth2/LICENSE similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/LICENSE rename to vendor/golang.org/x/oauth2/LICENSE diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/README.md b/vendor/golang.org/x/oauth2/README.md similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/README.md rename to vendor/golang.org/x/oauth2/README.md diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/client_appengine.go b/vendor/golang.org/x/oauth2/client_appengine.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/client_appengine.go rename to vendor/golang.org/x/oauth2/client_appengine.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/clientcredentials/clientcredentials.go b/vendor/golang.org/x/oauth2/clientcredentials/clientcredentials.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/clientcredentials/clientcredentials.go rename to vendor/golang.org/x/oauth2/clientcredentials/clientcredentials.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/clientcredentials/clientcredentials_test.go b/vendor/golang.org/x/oauth2/clientcredentials/clientcredentials_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/clientcredentials/clientcredentials_test.go rename to vendor/golang.org/x/oauth2/clientcredentials/clientcredentials_test.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/example_test.go b/vendor/golang.org/x/oauth2/example_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/example_test.go rename to vendor/golang.org/x/oauth2/example_test.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/facebook/facebook.go b/vendor/golang.org/x/oauth2/facebook/facebook.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/facebook/facebook.go rename to vendor/golang.org/x/oauth2/facebook/facebook.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/github/github.go b/vendor/golang.org/x/oauth2/github/github.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/github/github.go rename to vendor/golang.org/x/oauth2/github/github.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/google/appengine.go b/vendor/golang.org/x/oauth2/google/appengine.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/google/appengine.go rename to vendor/golang.org/x/oauth2/google/appengine.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/google/appengine_hook.go b/vendor/golang.org/x/oauth2/google/appengine_hook.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/google/appengine_hook.go rename to vendor/golang.org/x/oauth2/google/appengine_hook.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/google/default.go b/vendor/golang.org/x/oauth2/google/default.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/google/default.go rename to vendor/golang.org/x/oauth2/google/default.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/google/example_test.go b/vendor/golang.org/x/oauth2/google/example_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/google/example_test.go rename to vendor/golang.org/x/oauth2/google/example_test.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/google/google.go b/vendor/golang.org/x/oauth2/google/google.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/google/google.go rename to vendor/golang.org/x/oauth2/google/google.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/google/google_test.go b/vendor/golang.org/x/oauth2/google/google_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/google/google_test.go rename to vendor/golang.org/x/oauth2/google/google_test.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/google/sdk.go b/vendor/golang.org/x/oauth2/google/sdk.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/google/sdk.go rename to vendor/golang.org/x/oauth2/google/sdk.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/google/sdk_test.go b/vendor/golang.org/x/oauth2/google/sdk_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/google/sdk_test.go rename to vendor/golang.org/x/oauth2/google/sdk_test.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/google/testdata/gcloud/credentials b/vendor/golang.org/x/oauth2/google/testdata/gcloud/credentials similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/google/testdata/gcloud/credentials rename to vendor/golang.org/x/oauth2/google/testdata/gcloud/credentials diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/google/testdata/gcloud/properties b/vendor/golang.org/x/oauth2/google/testdata/gcloud/properties similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/google/testdata/gcloud/properties rename to vendor/golang.org/x/oauth2/google/testdata/gcloud/properties diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/internal/oauth2.go b/vendor/golang.org/x/oauth2/internal/oauth2.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/internal/oauth2.go rename to vendor/golang.org/x/oauth2/internal/oauth2.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/internal/oauth2_test.go b/vendor/golang.org/x/oauth2/internal/oauth2_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/internal/oauth2_test.go rename to vendor/golang.org/x/oauth2/internal/oauth2_test.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/internal/token.go b/vendor/golang.org/x/oauth2/internal/token.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/internal/token.go rename to vendor/golang.org/x/oauth2/internal/token.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/internal/token_test.go b/vendor/golang.org/x/oauth2/internal/token_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/internal/token_test.go rename to vendor/golang.org/x/oauth2/internal/token_test.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/internal/transport.go b/vendor/golang.org/x/oauth2/internal/transport.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/internal/transport.go rename to vendor/golang.org/x/oauth2/internal/transport.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/jws/jws.go b/vendor/golang.org/x/oauth2/jws/jws.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/jws/jws.go rename to vendor/golang.org/x/oauth2/jws/jws.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/jwt/example_test.go b/vendor/golang.org/x/oauth2/jwt/example_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/jwt/example_test.go rename to vendor/golang.org/x/oauth2/jwt/example_test.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/jwt/jwt.go b/vendor/golang.org/x/oauth2/jwt/jwt.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/jwt/jwt.go rename to vendor/golang.org/x/oauth2/jwt/jwt.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/jwt/jwt_test.go b/vendor/golang.org/x/oauth2/jwt/jwt_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/jwt/jwt_test.go rename to vendor/golang.org/x/oauth2/jwt/jwt_test.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/linkedin/linkedin.go b/vendor/golang.org/x/oauth2/linkedin/linkedin.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/linkedin/linkedin.go rename to vendor/golang.org/x/oauth2/linkedin/linkedin.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/oauth2.go b/vendor/golang.org/x/oauth2/oauth2.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/oauth2.go rename to vendor/golang.org/x/oauth2/oauth2.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/oauth2_test.go b/vendor/golang.org/x/oauth2/oauth2_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/oauth2_test.go rename to vendor/golang.org/x/oauth2/oauth2_test.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/odnoklassniki/odnoklassniki.go b/vendor/golang.org/x/oauth2/odnoklassniki/odnoklassniki.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/odnoklassniki/odnoklassniki.go rename to vendor/golang.org/x/oauth2/odnoklassniki/odnoklassniki.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/paypal/paypal.go b/vendor/golang.org/x/oauth2/paypal/paypal.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/paypal/paypal.go rename to vendor/golang.org/x/oauth2/paypal/paypal.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/token.go b/vendor/golang.org/x/oauth2/token.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/token.go rename to vendor/golang.org/x/oauth2/token.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/token_test.go b/vendor/golang.org/x/oauth2/token_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/token_test.go rename to vendor/golang.org/x/oauth2/token_test.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/transport.go b/vendor/golang.org/x/oauth2/transport.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/transport.go rename to vendor/golang.org/x/oauth2/transport.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/transport_test.go b/vendor/golang.org/x/oauth2/transport_test.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/transport_test.go rename to vendor/golang.org/x/oauth2/transport_test.go diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/vk/vk.go b/vendor/golang.org/x/oauth2/vk/vk.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/oauth2/vk/vk.go rename to vendor/golang.org/x/oauth2/vk/vk.go diff --git a/Godeps/_workspace/src/google.golang.org/api/.hgignore b/vendor/google.golang.org/api/.hgignore similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/.hgignore rename to vendor/google.golang.org/api/.hgignore diff --git a/Godeps/_workspace/src/google.golang.org/api/.hgtags b/vendor/google.golang.org/api/.hgtags similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/.hgtags rename to vendor/google.golang.org/api/.hgtags diff --git a/Godeps/_workspace/src/google.golang.org/api/.travis.yml b/vendor/google.golang.org/api/.travis.yml similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/.travis.yml rename to vendor/google.golang.org/api/.travis.yml diff --git a/Godeps/_workspace/src/google.golang.org/api/AUTHORS b/vendor/google.golang.org/api/AUTHORS similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/AUTHORS rename to vendor/google.golang.org/api/AUTHORS diff --git a/Godeps/_workspace/src/google.golang.org/api/CONTRIBUTING.md b/vendor/google.golang.org/api/CONTRIBUTING.md similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/CONTRIBUTING.md rename to vendor/google.golang.org/api/CONTRIBUTING.md diff --git a/Godeps/_workspace/src/google.golang.org/api/CONTRIBUTORS b/vendor/google.golang.org/api/CONTRIBUTORS similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/CONTRIBUTORS rename to vendor/google.golang.org/api/CONTRIBUTORS diff --git a/Godeps/_workspace/src/google.golang.org/api/GettingStarted.md b/vendor/google.golang.org/api/GettingStarted.md similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/GettingStarted.md rename to vendor/google.golang.org/api/GettingStarted.md diff --git a/Godeps/_workspace/src/google.golang.org/api/LICENSE b/vendor/google.golang.org/api/LICENSE similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/LICENSE rename to vendor/google.golang.org/api/LICENSE diff --git a/Godeps/_workspace/src/google.golang.org/api/Makefile b/vendor/google.golang.org/api/Makefile similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/Makefile rename to vendor/google.golang.org/api/Makefile diff --git a/Godeps/_workspace/src/google.golang.org/api/NOTES b/vendor/google.golang.org/api/NOTES similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/NOTES rename to vendor/google.golang.org/api/NOTES diff --git a/Godeps/_workspace/src/google.golang.org/api/README.md b/vendor/google.golang.org/api/README.md similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/README.md rename to vendor/google.golang.org/api/README.md diff --git a/Godeps/_workspace/src/google.golang.org/api/TODO b/vendor/google.golang.org/api/TODO similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/TODO rename to vendor/google.golang.org/api/TODO diff --git a/Godeps/_workspace/src/google.golang.org/api/adexchangebuyer/v1.2/adexchangebuyer-api.json b/vendor/google.golang.org/api/adexchangebuyer/v1.2/adexchangebuyer-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adexchangebuyer/v1.2/adexchangebuyer-api.json rename to vendor/google.golang.org/api/adexchangebuyer/v1.2/adexchangebuyer-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/adexchangebuyer/v1.2/adexchangebuyer-gen.go b/vendor/google.golang.org/api/adexchangebuyer/v1.2/adexchangebuyer-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adexchangebuyer/v1.2/adexchangebuyer-gen.go rename to vendor/google.golang.org/api/adexchangebuyer/v1.2/adexchangebuyer-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/adexchangebuyer/v1.3/adexchangebuyer-api.json b/vendor/google.golang.org/api/adexchangebuyer/v1.3/adexchangebuyer-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adexchangebuyer/v1.3/adexchangebuyer-api.json rename to vendor/google.golang.org/api/adexchangebuyer/v1.3/adexchangebuyer-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/adexchangebuyer/v1.3/adexchangebuyer-gen.go b/vendor/google.golang.org/api/adexchangebuyer/v1.3/adexchangebuyer-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adexchangebuyer/v1.3/adexchangebuyer-gen.go rename to vendor/google.golang.org/api/adexchangebuyer/v1.3/adexchangebuyer-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/adexchangebuyer/v1.4/adexchangebuyer-api.json b/vendor/google.golang.org/api/adexchangebuyer/v1.4/adexchangebuyer-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adexchangebuyer/v1.4/adexchangebuyer-api.json rename to vendor/google.golang.org/api/adexchangebuyer/v1.4/adexchangebuyer-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/adexchangebuyer/v1.4/adexchangebuyer-gen.go b/vendor/google.golang.org/api/adexchangebuyer/v1.4/adexchangebuyer-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adexchangebuyer/v1.4/adexchangebuyer-gen.go rename to vendor/google.golang.org/api/adexchangebuyer/v1.4/adexchangebuyer-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/adexchangeseller/v1.1/adexchangeseller-api.json b/vendor/google.golang.org/api/adexchangeseller/v1.1/adexchangeseller-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adexchangeseller/v1.1/adexchangeseller-api.json rename to vendor/google.golang.org/api/adexchangeseller/v1.1/adexchangeseller-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/adexchangeseller/v1.1/adexchangeseller-gen.go b/vendor/google.golang.org/api/adexchangeseller/v1.1/adexchangeseller-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adexchangeseller/v1.1/adexchangeseller-gen.go rename to vendor/google.golang.org/api/adexchangeseller/v1.1/adexchangeseller-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/adexchangeseller/v1/adexchangeseller-api.json b/vendor/google.golang.org/api/adexchangeseller/v1/adexchangeseller-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adexchangeseller/v1/adexchangeseller-api.json rename to vendor/google.golang.org/api/adexchangeseller/v1/adexchangeseller-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/adexchangeseller/v1/adexchangeseller-gen.go b/vendor/google.golang.org/api/adexchangeseller/v1/adexchangeseller-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adexchangeseller/v1/adexchangeseller-gen.go rename to vendor/google.golang.org/api/adexchangeseller/v1/adexchangeseller-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/adexchangeseller/v2.0/adexchangeseller-api.json b/vendor/google.golang.org/api/adexchangeseller/v2.0/adexchangeseller-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adexchangeseller/v2.0/adexchangeseller-api.json rename to vendor/google.golang.org/api/adexchangeseller/v2.0/adexchangeseller-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/adexchangeseller/v2.0/adexchangeseller-gen.go b/vendor/google.golang.org/api/adexchangeseller/v2.0/adexchangeseller-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adexchangeseller/v2.0/adexchangeseller-gen.go rename to vendor/google.golang.org/api/adexchangeseller/v2.0/adexchangeseller-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/admin/datatransfer/v1/admin-api.json b/vendor/google.golang.org/api/admin/datatransfer/v1/admin-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/admin/datatransfer/v1/admin-api.json rename to vendor/google.golang.org/api/admin/datatransfer/v1/admin-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/admin/datatransfer/v1/admin-gen.go b/vendor/google.golang.org/api/admin/datatransfer/v1/admin-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/admin/datatransfer/v1/admin-gen.go rename to vendor/google.golang.org/api/admin/datatransfer/v1/admin-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/admin/directory/v1/admin-api.json b/vendor/google.golang.org/api/admin/directory/v1/admin-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/admin/directory/v1/admin-api.json rename to vendor/google.golang.org/api/admin/directory/v1/admin-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/admin/directory/v1/admin-gen.go b/vendor/google.golang.org/api/admin/directory/v1/admin-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/admin/directory/v1/admin-gen.go rename to vendor/google.golang.org/api/admin/directory/v1/admin-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/admin/email_migration/v2/admin-api.json b/vendor/google.golang.org/api/admin/email_migration/v2/admin-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/admin/email_migration/v2/admin-api.json rename to vendor/google.golang.org/api/admin/email_migration/v2/admin-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/admin/email_migration/v2/admin-gen.go b/vendor/google.golang.org/api/admin/email_migration/v2/admin-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/admin/email_migration/v2/admin-gen.go rename to vendor/google.golang.org/api/admin/email_migration/v2/admin-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/admin/reports/v1/admin-api.json b/vendor/google.golang.org/api/admin/reports/v1/admin-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/admin/reports/v1/admin-api.json rename to vendor/google.golang.org/api/admin/reports/v1/admin-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/admin/reports/v1/admin-gen.go b/vendor/google.golang.org/api/admin/reports/v1/admin-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/admin/reports/v1/admin-gen.go rename to vendor/google.golang.org/api/admin/reports/v1/admin-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/adsense/v1.2/adsense-api.json b/vendor/google.golang.org/api/adsense/v1.2/adsense-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adsense/v1.2/adsense-api.json rename to vendor/google.golang.org/api/adsense/v1.2/adsense-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/adsense/v1.2/adsense-gen.go b/vendor/google.golang.org/api/adsense/v1.2/adsense-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adsense/v1.2/adsense-gen.go rename to vendor/google.golang.org/api/adsense/v1.2/adsense-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/adsense/v1.3/adsense-api.json b/vendor/google.golang.org/api/adsense/v1.3/adsense-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adsense/v1.3/adsense-api.json rename to vendor/google.golang.org/api/adsense/v1.3/adsense-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/adsense/v1.3/adsense-gen.go b/vendor/google.golang.org/api/adsense/v1.3/adsense-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adsense/v1.3/adsense-gen.go rename to vendor/google.golang.org/api/adsense/v1.3/adsense-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/adsense/v1.4/adsense-api.json b/vendor/google.golang.org/api/adsense/v1.4/adsense-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adsense/v1.4/adsense-api.json rename to vendor/google.golang.org/api/adsense/v1.4/adsense-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/adsense/v1.4/adsense-gen.go b/vendor/google.golang.org/api/adsense/v1.4/adsense-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adsense/v1.4/adsense-gen.go rename to vendor/google.golang.org/api/adsense/v1.4/adsense-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/adsensehost/v4.1/adsensehost-api.json b/vendor/google.golang.org/api/adsensehost/v4.1/adsensehost-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adsensehost/v4.1/adsensehost-api.json rename to vendor/google.golang.org/api/adsensehost/v4.1/adsensehost-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/adsensehost/v4.1/adsensehost-gen.go b/vendor/google.golang.org/api/adsensehost/v4.1/adsensehost-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/adsensehost/v4.1/adsensehost-gen.go rename to vendor/google.golang.org/api/adsensehost/v4.1/adsensehost-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/analytics/v2.4/analytics-api.json b/vendor/google.golang.org/api/analytics/v2.4/analytics-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/analytics/v2.4/analytics-api.json rename to vendor/google.golang.org/api/analytics/v2.4/analytics-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/analytics/v2.4/analytics-gen.go b/vendor/google.golang.org/api/analytics/v2.4/analytics-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/analytics/v2.4/analytics-gen.go rename to vendor/google.golang.org/api/analytics/v2.4/analytics-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/analytics/v3/analytics-api.json b/vendor/google.golang.org/api/analytics/v3/analytics-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/analytics/v3/analytics-api.json rename to vendor/google.golang.org/api/analytics/v3/analytics-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/analytics/v3/analytics-gen.go b/vendor/google.golang.org/api/analytics/v3/analytics-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/analytics/v3/analytics-gen.go rename to vendor/google.golang.org/api/analytics/v3/analytics-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/androidenterprise/v1/androidenterprise-api.json b/vendor/google.golang.org/api/androidenterprise/v1/androidenterprise-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/androidenterprise/v1/androidenterprise-api.json rename to vendor/google.golang.org/api/androidenterprise/v1/androidenterprise-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/androidenterprise/v1/androidenterprise-gen.go b/vendor/google.golang.org/api/androidenterprise/v1/androidenterprise-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/androidenterprise/v1/androidenterprise-gen.go rename to vendor/google.golang.org/api/androidenterprise/v1/androidenterprise-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/androidpublisher/v1.1/androidpublisher-api.json b/vendor/google.golang.org/api/androidpublisher/v1.1/androidpublisher-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/androidpublisher/v1.1/androidpublisher-api.json rename to vendor/google.golang.org/api/androidpublisher/v1.1/androidpublisher-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/androidpublisher/v1.1/androidpublisher-gen.go b/vendor/google.golang.org/api/androidpublisher/v1.1/androidpublisher-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/androidpublisher/v1.1/androidpublisher-gen.go rename to vendor/google.golang.org/api/androidpublisher/v1.1/androidpublisher-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/androidpublisher/v1/androidpublisher-api.json b/vendor/google.golang.org/api/androidpublisher/v1/androidpublisher-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/androidpublisher/v1/androidpublisher-api.json rename to vendor/google.golang.org/api/androidpublisher/v1/androidpublisher-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/androidpublisher/v1/androidpublisher-gen.go b/vendor/google.golang.org/api/androidpublisher/v1/androidpublisher-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/androidpublisher/v1/androidpublisher-gen.go rename to vendor/google.golang.org/api/androidpublisher/v1/androidpublisher-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/androidpublisher/v2/androidpublisher-api.json b/vendor/google.golang.org/api/androidpublisher/v2/androidpublisher-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/androidpublisher/v2/androidpublisher-api.json rename to vendor/google.golang.org/api/androidpublisher/v2/androidpublisher-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/androidpublisher/v2/androidpublisher-gen.go b/vendor/google.golang.org/api/androidpublisher/v2/androidpublisher-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/androidpublisher/v2/androidpublisher-gen.go rename to vendor/google.golang.org/api/androidpublisher/v2/androidpublisher-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/api-list.json b/vendor/google.golang.org/api/api-list.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/api-list.json rename to vendor/google.golang.org/api/api-list.json diff --git a/Godeps/_workspace/src/google.golang.org/api/appengine/v1beta4/appengine-api.json b/vendor/google.golang.org/api/appengine/v1beta4/appengine-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/appengine/v1beta4/appengine-api.json rename to vendor/google.golang.org/api/appengine/v1beta4/appengine-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/appengine/v1beta4/appengine-gen.go b/vendor/google.golang.org/api/appengine/v1beta4/appengine-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/appengine/v1beta4/appengine-gen.go rename to vendor/google.golang.org/api/appengine/v1beta4/appengine-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/appsactivity/v1/appsactivity-api.json b/vendor/google.golang.org/api/appsactivity/v1/appsactivity-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/appsactivity/v1/appsactivity-api.json rename to vendor/google.golang.org/api/appsactivity/v1/appsactivity-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/appsactivity/v1/appsactivity-gen.go b/vendor/google.golang.org/api/appsactivity/v1/appsactivity-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/appsactivity/v1/appsactivity-gen.go rename to vendor/google.golang.org/api/appsactivity/v1/appsactivity-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/appstate/v1/appstate-api.json b/vendor/google.golang.org/api/appstate/v1/appstate-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/appstate/v1/appstate-api.json rename to vendor/google.golang.org/api/appstate/v1/appstate-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/appstate/v1/appstate-gen.go b/vendor/google.golang.org/api/appstate/v1/appstate-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/appstate/v1/appstate-gen.go rename to vendor/google.golang.org/api/appstate/v1/appstate-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/autoscaler/v1beta2/autoscaler-api.json b/vendor/google.golang.org/api/autoscaler/v1beta2/autoscaler-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/autoscaler/v1beta2/autoscaler-api.json rename to vendor/google.golang.org/api/autoscaler/v1beta2/autoscaler-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/autoscaler/v1beta2/autoscaler-gen.go b/vendor/google.golang.org/api/autoscaler/v1beta2/autoscaler-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/autoscaler/v1beta2/autoscaler-gen.go rename to vendor/google.golang.org/api/autoscaler/v1beta2/autoscaler-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/bigquery/v2/bigquery-api.json b/vendor/google.golang.org/api/bigquery/v2/bigquery-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/bigquery/v2/bigquery-api.json rename to vendor/google.golang.org/api/bigquery/v2/bigquery-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/bigquery/v2/bigquery-gen.go b/vendor/google.golang.org/api/bigquery/v2/bigquery-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/bigquery/v2/bigquery-gen.go rename to vendor/google.golang.org/api/bigquery/v2/bigquery-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/blogger/v2/blogger-api.json b/vendor/google.golang.org/api/blogger/v2/blogger-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/blogger/v2/blogger-api.json rename to vendor/google.golang.org/api/blogger/v2/blogger-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/blogger/v2/blogger-gen.go b/vendor/google.golang.org/api/blogger/v2/blogger-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/blogger/v2/blogger-gen.go rename to vendor/google.golang.org/api/blogger/v2/blogger-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/blogger/v3/blogger-api.json b/vendor/google.golang.org/api/blogger/v3/blogger-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/blogger/v3/blogger-api.json rename to vendor/google.golang.org/api/blogger/v3/blogger-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/blogger/v3/blogger-gen.go b/vendor/google.golang.org/api/blogger/v3/blogger-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/blogger/v3/blogger-gen.go rename to vendor/google.golang.org/api/blogger/v3/blogger-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/books/v1/books-api.json b/vendor/google.golang.org/api/books/v1/books-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/books/v1/books-api.json rename to vendor/google.golang.org/api/books/v1/books-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/books/v1/books-gen.go b/vendor/google.golang.org/api/books/v1/books-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/books/v1/books-gen.go rename to vendor/google.golang.org/api/books/v1/books-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/calendar/v3/calendar-api.json b/vendor/google.golang.org/api/calendar/v3/calendar-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/calendar/v3/calendar-api.json rename to vendor/google.golang.org/api/calendar/v3/calendar-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/calendar/v3/calendar-gen.go b/vendor/google.golang.org/api/calendar/v3/calendar-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/calendar/v3/calendar-gen.go rename to vendor/google.golang.org/api/calendar/v3/calendar-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/civicinfo/v2/civicinfo-api.json b/vendor/google.golang.org/api/civicinfo/v2/civicinfo-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/civicinfo/v2/civicinfo-api.json rename to vendor/google.golang.org/api/civicinfo/v2/civicinfo-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/civicinfo/v2/civicinfo-gen.go b/vendor/google.golang.org/api/civicinfo/v2/civicinfo-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/civicinfo/v2/civicinfo-gen.go rename to vendor/google.golang.org/api/civicinfo/v2/civicinfo-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/classroom/v1/classroom-api.json b/vendor/google.golang.org/api/classroom/v1/classroom-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/classroom/v1/classroom-api.json rename to vendor/google.golang.org/api/classroom/v1/classroom-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/classroom/v1/classroom-gen.go b/vendor/google.golang.org/api/classroom/v1/classroom-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/classroom/v1/classroom-gen.go rename to vendor/google.golang.org/api/classroom/v1/classroom-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/cloudbilling/v1/cloudbilling-api.json b/vendor/google.golang.org/api/cloudbilling/v1/cloudbilling-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/cloudbilling/v1/cloudbilling-api.json rename to vendor/google.golang.org/api/cloudbilling/v1/cloudbilling-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/cloudbilling/v1/cloudbilling-gen.go b/vendor/google.golang.org/api/cloudbilling/v1/cloudbilling-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/cloudbilling/v1/cloudbilling-gen.go rename to vendor/google.golang.org/api/cloudbilling/v1/cloudbilling-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/clouddebugger/v2/clouddebugger-api.json b/vendor/google.golang.org/api/clouddebugger/v2/clouddebugger-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/clouddebugger/v2/clouddebugger-api.json rename to vendor/google.golang.org/api/clouddebugger/v2/clouddebugger-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/clouddebugger/v2/clouddebugger-gen.go b/vendor/google.golang.org/api/clouddebugger/v2/clouddebugger-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/clouddebugger/v2/clouddebugger-gen.go rename to vendor/google.golang.org/api/clouddebugger/v2/clouddebugger-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/cloudlatencytest/v2/cloudlatencytest-api.json b/vendor/google.golang.org/api/cloudlatencytest/v2/cloudlatencytest-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/cloudlatencytest/v2/cloudlatencytest-api.json rename to vendor/google.golang.org/api/cloudlatencytest/v2/cloudlatencytest-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/cloudlatencytest/v2/cloudlatencytest-gen.go b/vendor/google.golang.org/api/cloudlatencytest/v2/cloudlatencytest-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/cloudlatencytest/v2/cloudlatencytest-gen.go rename to vendor/google.golang.org/api/cloudlatencytest/v2/cloudlatencytest-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-api.json b/vendor/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-api.json rename to vendor/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-gen.go b/vendor/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-gen.go rename to vendor/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/cloudresourcemanager/v1beta1/cloudresourcemanager-api.json b/vendor/google.golang.org/api/cloudresourcemanager/v1beta1/cloudresourcemanager-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/cloudresourcemanager/v1beta1/cloudresourcemanager-api.json rename to vendor/google.golang.org/api/cloudresourcemanager/v1beta1/cloudresourcemanager-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/cloudresourcemanager/v1beta1/cloudresourcemanager-gen.go b/vendor/google.golang.org/api/cloudresourcemanager/v1beta1/cloudresourcemanager-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/cloudresourcemanager/v1beta1/cloudresourcemanager-gen.go rename to vendor/google.golang.org/api/cloudresourcemanager/v1beta1/cloudresourcemanager-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/cloudtrace/v1/cloudtrace-api.json b/vendor/google.golang.org/api/cloudtrace/v1/cloudtrace-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/cloudtrace/v1/cloudtrace-api.json rename to vendor/google.golang.org/api/cloudtrace/v1/cloudtrace-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/cloudtrace/v1/cloudtrace-gen.go b/vendor/google.golang.org/api/cloudtrace/v1/cloudtrace-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/cloudtrace/v1/cloudtrace-gen.go rename to vendor/google.golang.org/api/cloudtrace/v1/cloudtrace-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/v0.alpha/clouduseraccounts-api.json b/vendor/google.golang.org/api/clouduseraccounts/v0.alpha/clouduseraccounts-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/v0.alpha/clouduseraccounts-api.json rename to vendor/google.golang.org/api/clouduseraccounts/v0.alpha/clouduseraccounts-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/v0.alpha/clouduseraccounts-gen.go b/vendor/google.golang.org/api/clouduseraccounts/v0.alpha/clouduseraccounts-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/v0.alpha/clouduseraccounts-gen.go rename to vendor/google.golang.org/api/clouduseraccounts/v0.alpha/clouduseraccounts-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/v0.beta/clouduseraccounts-api.json b/vendor/google.golang.org/api/clouduseraccounts/v0.beta/clouduseraccounts-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/v0.beta/clouduseraccounts-api.json rename to vendor/google.golang.org/api/clouduseraccounts/v0.beta/clouduseraccounts-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/v0.beta/clouduseraccounts-gen.go b/vendor/google.golang.org/api/clouduseraccounts/v0.beta/clouduseraccounts-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/v0.beta/clouduseraccounts-gen.go rename to vendor/google.golang.org/api/clouduseraccounts/v0.beta/clouduseraccounts-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/vm_alpha/clouduseraccounts-api.json b/vendor/google.golang.org/api/clouduseraccounts/vm_alpha/clouduseraccounts-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/vm_alpha/clouduseraccounts-api.json rename to vendor/google.golang.org/api/clouduseraccounts/vm_alpha/clouduseraccounts-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/vm_alpha/clouduseraccounts-gen.go b/vendor/google.golang.org/api/clouduseraccounts/vm_alpha/clouduseraccounts-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/vm_alpha/clouduseraccounts-gen.go rename to vendor/google.golang.org/api/clouduseraccounts/vm_alpha/clouduseraccounts-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/vm_beta/clouduseraccounts-api.json b/vendor/google.golang.org/api/clouduseraccounts/vm_beta/clouduseraccounts-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/vm_beta/clouduseraccounts-api.json rename to vendor/google.golang.org/api/clouduseraccounts/vm_beta/clouduseraccounts-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/vm_beta/clouduseraccounts-gen.go b/vendor/google.golang.org/api/clouduseraccounts/vm_beta/clouduseraccounts-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/clouduseraccounts/vm_beta/clouduseraccounts-gen.go rename to vendor/google.golang.org/api/clouduseraccounts/vm_beta/clouduseraccounts-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/compute/v0.beta/compute-api.json b/vendor/google.golang.org/api/compute/v0.beta/compute-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/compute/v0.beta/compute-api.json rename to vendor/google.golang.org/api/compute/v0.beta/compute-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/compute/v0.beta/compute-gen.go b/vendor/google.golang.org/api/compute/v0.beta/compute-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/compute/v0.beta/compute-gen.go rename to vendor/google.golang.org/api/compute/v0.beta/compute-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/compute/v1/compute-api.json b/vendor/google.golang.org/api/compute/v1/compute-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/compute/v1/compute-api.json rename to vendor/google.golang.org/api/compute/v1/compute-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/compute/v1/compute-gen.go b/vendor/google.golang.org/api/compute/v1/compute-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/compute/v1/compute-gen.go rename to vendor/google.golang.org/api/compute/v1/compute-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/container/v1/container-api.json b/vendor/google.golang.org/api/container/v1/container-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/container/v1/container-api.json rename to vendor/google.golang.org/api/container/v1/container-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/container/v1/container-gen.go b/vendor/google.golang.org/api/container/v1/container-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/container/v1/container-gen.go rename to vendor/google.golang.org/api/container/v1/container-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/container/v1beta1/container-api.json b/vendor/google.golang.org/api/container/v1beta1/container-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/container/v1beta1/container-api.json rename to vendor/google.golang.org/api/container/v1beta1/container-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/container/v1beta1/container-gen.go b/vendor/google.golang.org/api/container/v1beta1/container-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/container/v1beta1/container-gen.go rename to vendor/google.golang.org/api/container/v1beta1/container-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/content/v2/content-api.json b/vendor/google.golang.org/api/content/v2/content-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/content/v2/content-api.json rename to vendor/google.golang.org/api/content/v2/content-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/content/v2/content-gen.go b/vendor/google.golang.org/api/content/v2/content-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/content/v2/content-gen.go rename to vendor/google.golang.org/api/content/v2/content-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/content/v2sandbox/content-api.json b/vendor/google.golang.org/api/content/v2sandbox/content-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/content/v2sandbox/content-api.json rename to vendor/google.golang.org/api/content/v2sandbox/content-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/content/v2sandbox/content-gen.go b/vendor/google.golang.org/api/content/v2sandbox/content-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/content/v2sandbox/content-gen.go rename to vendor/google.golang.org/api/content/v2sandbox/content-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/coordinate/v1/coordinate-api.json b/vendor/google.golang.org/api/coordinate/v1/coordinate-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/coordinate/v1/coordinate-api.json rename to vendor/google.golang.org/api/coordinate/v1/coordinate-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/coordinate/v1/coordinate-gen.go b/vendor/google.golang.org/api/coordinate/v1/coordinate-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/coordinate/v1/coordinate-gen.go rename to vendor/google.golang.org/api/coordinate/v1/coordinate-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/customsearch/v1/customsearch-api.json b/vendor/google.golang.org/api/customsearch/v1/customsearch-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/customsearch/v1/customsearch-api.json rename to vendor/google.golang.org/api/customsearch/v1/customsearch-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/customsearch/v1/customsearch-gen.go b/vendor/google.golang.org/api/customsearch/v1/customsearch-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/customsearch/v1/customsearch-gen.go rename to vendor/google.golang.org/api/customsearch/v1/customsearch-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/dataflow/v1b3/dataflow-api.json b/vendor/google.golang.org/api/dataflow/v1b3/dataflow-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dataflow/v1b3/dataflow-api.json rename to vendor/google.golang.org/api/dataflow/v1b3/dataflow-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/dataflow/v1b3/dataflow-gen.go b/vendor/google.golang.org/api/dataflow/v1b3/dataflow-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dataflow/v1b3/dataflow-gen.go rename to vendor/google.golang.org/api/dataflow/v1b3/dataflow-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/datastore/v1beta1/datastore-api.json b/vendor/google.golang.org/api/datastore/v1beta1/datastore-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/datastore/v1beta1/datastore-api.json rename to vendor/google.golang.org/api/datastore/v1beta1/datastore-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/datastore/v1beta1/datastore-gen.go b/vendor/google.golang.org/api/datastore/v1beta1/datastore-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/datastore/v1beta1/datastore-gen.go rename to vendor/google.golang.org/api/datastore/v1beta1/datastore-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/datastore/v1beta2/datastore-api.json b/vendor/google.golang.org/api/datastore/v1beta2/datastore-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/datastore/v1beta2/datastore-api.json rename to vendor/google.golang.org/api/datastore/v1beta2/datastore-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/datastore/v1beta2/datastore-gen.go b/vendor/google.golang.org/api/datastore/v1beta2/datastore-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/datastore/v1beta2/datastore-gen.go rename to vendor/google.golang.org/api/datastore/v1beta2/datastore-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/deploymentmanager/v2/deploymentmanager-api.json b/vendor/google.golang.org/api/deploymentmanager/v2/deploymentmanager-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/deploymentmanager/v2/deploymentmanager-api.json rename to vendor/google.golang.org/api/deploymentmanager/v2/deploymentmanager-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/deploymentmanager/v2/deploymentmanager-gen.go b/vendor/google.golang.org/api/deploymentmanager/v2/deploymentmanager-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/deploymentmanager/v2/deploymentmanager-gen.go rename to vendor/google.golang.org/api/deploymentmanager/v2/deploymentmanager-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/deploymentmanager/v2beta1/deploymentmanager-api.json b/vendor/google.golang.org/api/deploymentmanager/v2beta1/deploymentmanager-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/deploymentmanager/v2beta1/deploymentmanager-api.json rename to vendor/google.golang.org/api/deploymentmanager/v2beta1/deploymentmanager-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/deploymentmanager/v2beta1/deploymentmanager-gen.go b/vendor/google.golang.org/api/deploymentmanager/v2beta1/deploymentmanager-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/deploymentmanager/v2beta1/deploymentmanager-gen.go rename to vendor/google.golang.org/api/deploymentmanager/v2beta1/deploymentmanager-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/deploymentmanager/v2beta2/deploymentmanager-api.json b/vendor/google.golang.org/api/deploymentmanager/v2beta2/deploymentmanager-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/deploymentmanager/v2beta2/deploymentmanager-api.json rename to vendor/google.golang.org/api/deploymentmanager/v2beta2/deploymentmanager-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/deploymentmanager/v2beta2/deploymentmanager-gen.go b/vendor/google.golang.org/api/deploymentmanager/v2beta2/deploymentmanager-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/deploymentmanager/v2beta2/deploymentmanager-gen.go rename to vendor/google.golang.org/api/deploymentmanager/v2beta2/deploymentmanager-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/dfareporting/v1.1/dfareporting-api.json b/vendor/google.golang.org/api/dfareporting/v1.1/dfareporting-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dfareporting/v1.1/dfareporting-api.json rename to vendor/google.golang.org/api/dfareporting/v1.1/dfareporting-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/dfareporting/v1.1/dfareporting-gen.go b/vendor/google.golang.org/api/dfareporting/v1.1/dfareporting-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dfareporting/v1.1/dfareporting-gen.go rename to vendor/google.golang.org/api/dfareporting/v1.1/dfareporting-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/dfareporting/v1.2/dfareporting-api.json b/vendor/google.golang.org/api/dfareporting/v1.2/dfareporting-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dfareporting/v1.2/dfareporting-api.json rename to vendor/google.golang.org/api/dfareporting/v1.2/dfareporting-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/dfareporting/v1.2/dfareporting-gen.go b/vendor/google.golang.org/api/dfareporting/v1.2/dfareporting-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dfareporting/v1.2/dfareporting-gen.go rename to vendor/google.golang.org/api/dfareporting/v1.2/dfareporting-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/dfareporting/v1.3/dfareporting-api.json b/vendor/google.golang.org/api/dfareporting/v1.3/dfareporting-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dfareporting/v1.3/dfareporting-api.json rename to vendor/google.golang.org/api/dfareporting/v1.3/dfareporting-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/dfareporting/v1.3/dfareporting-gen.go b/vendor/google.golang.org/api/dfareporting/v1.3/dfareporting-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dfareporting/v1.3/dfareporting-gen.go rename to vendor/google.golang.org/api/dfareporting/v1.3/dfareporting-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/dfareporting/v1/dfareporting-api.json b/vendor/google.golang.org/api/dfareporting/v1/dfareporting-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dfareporting/v1/dfareporting-api.json rename to vendor/google.golang.org/api/dfareporting/v1/dfareporting-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/dfareporting/v1/dfareporting-gen.go b/vendor/google.golang.org/api/dfareporting/v1/dfareporting-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dfareporting/v1/dfareporting-gen.go rename to vendor/google.golang.org/api/dfareporting/v1/dfareporting-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/dfareporting/v2.0/dfareporting-api.json b/vendor/google.golang.org/api/dfareporting/v2.0/dfareporting-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dfareporting/v2.0/dfareporting-api.json rename to vendor/google.golang.org/api/dfareporting/v2.0/dfareporting-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/dfareporting/v2.0/dfareporting-gen.go b/vendor/google.golang.org/api/dfareporting/v2.0/dfareporting-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dfareporting/v2.0/dfareporting-gen.go rename to vendor/google.golang.org/api/dfareporting/v2.0/dfareporting-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/dfareporting/v2.1/dfareporting-api.json b/vendor/google.golang.org/api/dfareporting/v2.1/dfareporting-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dfareporting/v2.1/dfareporting-api.json rename to vendor/google.golang.org/api/dfareporting/v2.1/dfareporting-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/dfareporting/v2.1/dfareporting-gen.go b/vendor/google.golang.org/api/dfareporting/v2.1/dfareporting-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dfareporting/v2.1/dfareporting-gen.go rename to vendor/google.golang.org/api/dfareporting/v2.1/dfareporting-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/dfareporting/v2.2/dfareporting-api.json b/vendor/google.golang.org/api/dfareporting/v2.2/dfareporting-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dfareporting/v2.2/dfareporting-api.json rename to vendor/google.golang.org/api/dfareporting/v2.2/dfareporting-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/dfareporting/v2.2/dfareporting-gen.go b/vendor/google.golang.org/api/dfareporting/v2.2/dfareporting-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dfareporting/v2.2/dfareporting-gen.go rename to vendor/google.golang.org/api/dfareporting/v2.2/dfareporting-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/discovery/v1/discovery-api.json b/vendor/google.golang.org/api/discovery/v1/discovery-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/discovery/v1/discovery-api.json rename to vendor/google.golang.org/api/discovery/v1/discovery-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/discovery/v1/discovery-gen.go b/vendor/google.golang.org/api/discovery/v1/discovery-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/discovery/v1/discovery-gen.go rename to vendor/google.golang.org/api/discovery/v1/discovery-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/dns/v1/dns-api.json b/vendor/google.golang.org/api/dns/v1/dns-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dns/v1/dns-api.json rename to vendor/google.golang.org/api/dns/v1/dns-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/dns/v1/dns-gen.go b/vendor/google.golang.org/api/dns/v1/dns-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dns/v1/dns-gen.go rename to vendor/google.golang.org/api/dns/v1/dns-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/dns/v1beta1/dns-api.json b/vendor/google.golang.org/api/dns/v1beta1/dns-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dns/v1beta1/dns-api.json rename to vendor/google.golang.org/api/dns/v1beta1/dns-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/dns/v1beta1/dns-gen.go b/vendor/google.golang.org/api/dns/v1beta1/dns-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/dns/v1beta1/dns-gen.go rename to vendor/google.golang.org/api/dns/v1beta1/dns-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/doubleclickbidmanager/v1/doubleclickbidmanager-api.json b/vendor/google.golang.org/api/doubleclickbidmanager/v1/doubleclickbidmanager-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/doubleclickbidmanager/v1/doubleclickbidmanager-api.json rename to vendor/google.golang.org/api/doubleclickbidmanager/v1/doubleclickbidmanager-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/doubleclickbidmanager/v1/doubleclickbidmanager-gen.go b/vendor/google.golang.org/api/doubleclickbidmanager/v1/doubleclickbidmanager-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/doubleclickbidmanager/v1/doubleclickbidmanager-gen.go rename to vendor/google.golang.org/api/doubleclickbidmanager/v1/doubleclickbidmanager-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/doubleclicksearch/v2/doubleclicksearch-api.json b/vendor/google.golang.org/api/doubleclicksearch/v2/doubleclicksearch-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/doubleclicksearch/v2/doubleclicksearch-api.json rename to vendor/google.golang.org/api/doubleclicksearch/v2/doubleclicksearch-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/doubleclicksearch/v2/doubleclicksearch-gen.go b/vendor/google.golang.org/api/doubleclicksearch/v2/doubleclicksearch-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/doubleclicksearch/v2/doubleclicksearch-gen.go rename to vendor/google.golang.org/api/doubleclicksearch/v2/doubleclicksearch-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/drive/v1/drive-api.json b/vendor/google.golang.org/api/drive/v1/drive-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/drive/v1/drive-api.json rename to vendor/google.golang.org/api/drive/v1/drive-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/drive/v1/drive-gen.go b/vendor/google.golang.org/api/drive/v1/drive-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/drive/v1/drive-gen.go rename to vendor/google.golang.org/api/drive/v1/drive-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/drive/v2/drive-api.json b/vendor/google.golang.org/api/drive/v2/drive-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/drive/v2/drive-api.json rename to vendor/google.golang.org/api/drive/v2/drive-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/drive/v2/drive-gen.go b/vendor/google.golang.org/api/drive/v2/drive-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/drive/v2/drive-gen.go rename to vendor/google.golang.org/api/drive/v2/drive-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/bigquery.go b/vendor/google.golang.org/api/examples/bigquery.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/bigquery.go rename to vendor/google.golang.org/api/examples/bigquery.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/books.go b/vendor/google.golang.org/api/examples/books.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/books.go rename to vendor/google.golang.org/api/examples/books.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/calendar.go b/vendor/google.golang.org/api/examples/calendar.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/calendar.go rename to vendor/google.golang.org/api/examples/calendar.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/compute.go b/vendor/google.golang.org/api/examples/compute.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/compute.go rename to vendor/google.golang.org/api/examples/compute.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/debug.go b/vendor/google.golang.org/api/examples/debug.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/debug.go rename to vendor/google.golang.org/api/examples/debug.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/drive.go b/vendor/google.golang.org/api/examples/drive.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/drive.go rename to vendor/google.golang.org/api/examples/drive.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/fitness.go b/vendor/google.golang.org/api/examples/fitness.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/fitness.go rename to vendor/google.golang.org/api/examples/fitness.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/gmail.go b/vendor/google.golang.org/api/examples/gmail.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/gmail.go rename to vendor/google.golang.org/api/examples/gmail.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/gopher.png b/vendor/google.golang.org/api/examples/gopher.png similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/gopher.png rename to vendor/google.golang.org/api/examples/gopher.png diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/main.go b/vendor/google.golang.org/api/examples/main.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/main.go rename to vendor/google.golang.org/api/examples/main.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/mapsengine.go b/vendor/google.golang.org/api/examples/mapsengine.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/mapsengine.go rename to vendor/google.golang.org/api/examples/mapsengine.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/mirror.go b/vendor/google.golang.org/api/examples/mirror.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/mirror.go rename to vendor/google.golang.org/api/examples/mirror.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/prediction.go b/vendor/google.golang.org/api/examples/prediction.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/prediction.go rename to vendor/google.golang.org/api/examples/prediction.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/pubsub.go b/vendor/google.golang.org/api/examples/pubsub.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/pubsub.go rename to vendor/google.golang.org/api/examples/pubsub.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/storage.go b/vendor/google.golang.org/api/examples/storage.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/storage.go rename to vendor/google.golang.org/api/examples/storage.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/tasks.go b/vendor/google.golang.org/api/examples/tasks.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/tasks.go rename to vendor/google.golang.org/api/examples/tasks.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/urlshortener.go b/vendor/google.golang.org/api/examples/urlshortener.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/urlshortener.go rename to vendor/google.golang.org/api/examples/urlshortener.go diff --git a/Godeps/_workspace/src/google.golang.org/api/examples/youtube.go b/vendor/google.golang.org/api/examples/youtube.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/examples/youtube.go rename to vendor/google.golang.org/api/examples/youtube.go diff --git a/Godeps/_workspace/src/google.golang.org/api/fitness/v1/fitness-api.json b/vendor/google.golang.org/api/fitness/v1/fitness-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/fitness/v1/fitness-api.json rename to vendor/google.golang.org/api/fitness/v1/fitness-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/fitness/v1/fitness-gen.go b/vendor/google.golang.org/api/fitness/v1/fitness-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/fitness/v1/fitness-gen.go rename to vendor/google.golang.org/api/fitness/v1/fitness-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/freebase/v1/freebase-api.json b/vendor/google.golang.org/api/freebase/v1/freebase-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/freebase/v1/freebase-api.json rename to vendor/google.golang.org/api/freebase/v1/freebase-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/freebase/v1/freebase-gen.go b/vendor/google.golang.org/api/freebase/v1/freebase-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/freebase/v1/freebase-gen.go rename to vendor/google.golang.org/api/freebase/v1/freebase-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/fusiontables/v1/fusiontables-api.json b/vendor/google.golang.org/api/fusiontables/v1/fusiontables-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/fusiontables/v1/fusiontables-api.json rename to vendor/google.golang.org/api/fusiontables/v1/fusiontables-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/fusiontables/v1/fusiontables-gen.go b/vendor/google.golang.org/api/fusiontables/v1/fusiontables-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/fusiontables/v1/fusiontables-gen.go rename to vendor/google.golang.org/api/fusiontables/v1/fusiontables-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/fusiontables/v2/fusiontables-api.json b/vendor/google.golang.org/api/fusiontables/v2/fusiontables-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/fusiontables/v2/fusiontables-api.json rename to vendor/google.golang.org/api/fusiontables/v2/fusiontables-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/fusiontables/v2/fusiontables-gen.go b/vendor/google.golang.org/api/fusiontables/v2/fusiontables-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/fusiontables/v2/fusiontables-gen.go rename to vendor/google.golang.org/api/fusiontables/v2/fusiontables-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/games/v1/games-api.json b/vendor/google.golang.org/api/games/v1/games-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/games/v1/games-api.json rename to vendor/google.golang.org/api/games/v1/games-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/games/v1/games-gen.go b/vendor/google.golang.org/api/games/v1/games-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/games/v1/games-gen.go rename to vendor/google.golang.org/api/games/v1/games-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/gamesconfiguration/v1configuration/gamesconfiguration-api.json b/vendor/google.golang.org/api/gamesconfiguration/v1configuration/gamesconfiguration-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/gamesconfiguration/v1configuration/gamesconfiguration-api.json rename to vendor/google.golang.org/api/gamesconfiguration/v1configuration/gamesconfiguration-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/gamesconfiguration/v1configuration/gamesconfiguration-gen.go b/vendor/google.golang.org/api/gamesconfiguration/v1configuration/gamesconfiguration-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/gamesconfiguration/v1configuration/gamesconfiguration-gen.go rename to vendor/google.golang.org/api/gamesconfiguration/v1configuration/gamesconfiguration-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/gamesmanagement/v1management/gamesmanagement-api.json b/vendor/google.golang.org/api/gamesmanagement/v1management/gamesmanagement-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/gamesmanagement/v1management/gamesmanagement-api.json rename to vendor/google.golang.org/api/gamesmanagement/v1management/gamesmanagement-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/gamesmanagement/v1management/gamesmanagement-gen.go b/vendor/google.golang.org/api/gamesmanagement/v1management/gamesmanagement-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/gamesmanagement/v1management/gamesmanagement-gen.go rename to vendor/google.golang.org/api/gamesmanagement/v1management/gamesmanagement-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/gan/v1beta1/gan-api.json b/vendor/google.golang.org/api/gan/v1beta1/gan-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/gan/v1beta1/gan-api.json rename to vendor/google.golang.org/api/gan/v1beta1/gan-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/gan/v1beta1/gan-gen.go b/vendor/google.golang.org/api/gan/v1beta1/gan-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/gan/v1beta1/gan-gen.go rename to vendor/google.golang.org/api/gan/v1beta1/gan-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/genomics/v1/genomics-api.json b/vendor/google.golang.org/api/genomics/v1/genomics-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/genomics/v1/genomics-api.json rename to vendor/google.golang.org/api/genomics/v1/genomics-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/genomics/v1/genomics-gen.go b/vendor/google.golang.org/api/genomics/v1/genomics-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/genomics/v1/genomics-gen.go rename to vendor/google.golang.org/api/genomics/v1/genomics-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/genomics/v1beta2/genomics-api.json b/vendor/google.golang.org/api/genomics/v1beta2/genomics-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/genomics/v1beta2/genomics-api.json rename to vendor/google.golang.org/api/genomics/v1beta2/genomics-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/genomics/v1beta2/genomics-gen.go b/vendor/google.golang.org/api/genomics/v1beta2/genomics-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/genomics/v1beta2/genomics-gen.go rename to vendor/google.golang.org/api/genomics/v1beta2/genomics-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/gmail/v1/gmail-api.json b/vendor/google.golang.org/api/gmail/v1/gmail-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/gmail/v1/gmail-api.json rename to vendor/google.golang.org/api/gmail/v1/gmail-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/gmail/v1/gmail-gen.go b/vendor/google.golang.org/api/gmail/v1/gmail-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/gmail/v1/gmail-gen.go rename to vendor/google.golang.org/api/gmail/v1/gmail-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/docurls.go b/vendor/google.golang.org/api/google-api-go-generator/docurls.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/docurls.go rename to vendor/google.golang.org/api/google-api-go-generator/docurls.go diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/gen.go b/vendor/google.golang.org/api/google-api-go-generator/gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/gen.go rename to vendor/google.golang.org/api/google-api-go-generator/gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/gen_test.go b/vendor/google.golang.org/api/google-api-go-generator/gen_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/gen_test.go rename to vendor/google.golang.org/api/google-api-go-generator/gen_test.go diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/storage_test.go b/vendor/google.golang.org/api/google-api-go-generator/storage_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/storage_test.go rename to vendor/google.golang.org/api/google-api-go-generator/storage_test.go diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/any.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/any.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/any.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/any.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/any.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/any.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/any.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/any.want diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofarray-1.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofarray-1.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofarray-1.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofarray-1.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofarray-1.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofarray-1.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofarray-1.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofarray-1.want diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofenum.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofenum.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofenum.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofenum.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofenum.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofenum.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofenum.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofenum.want diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofobjects.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofobjects.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofobjects.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofobjects.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofobjects.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofobjects.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofobjects.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofobjects.want diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofstrings.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofstrings.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofstrings.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofstrings.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofstrings.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofstrings.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofstrings.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofstrings.want diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/blogger-3.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/blogger-3.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/blogger-3.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/blogger-3.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/blogger-3.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/blogger-3.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/blogger-3.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/blogger-3.want diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/getwithoutbody.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/getwithoutbody.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/getwithoutbody.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/getwithoutbody.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/getwithoutbody.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/getwithoutbody.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/getwithoutbody.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/getwithoutbody.want diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofany.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/mapofany.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofany.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/mapofany.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofany.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/mapofany.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofany.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/mapofany.want diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofarrayofobjects.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/mapofarrayofobjects.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofarrayofobjects.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/mapofarrayofobjects.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofarrayofobjects.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/mapofarrayofobjects.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofarrayofobjects.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/mapofarrayofobjects.want diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofobjects.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/mapofobjects.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofobjects.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/mapofobjects.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofobjects.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/mapofobjects.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofobjects.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/mapofobjects.want diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofstrings-1.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/mapofstrings-1.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofstrings-1.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/mapofstrings-1.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofstrings-1.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/mapofstrings-1.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofstrings-1.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/mapofstrings-1.want diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/quotednum.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/quotednum.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/quotednum.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/quotednum.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/quotednum.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/quotednum.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/quotednum.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/quotednum.want diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/resource-named-service.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/resource-named-service.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/resource-named-service.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/resource-named-service.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/resource-named-service.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/resource-named-service.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/resource-named-service.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/resource-named-service.want diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/unfortunatedefaults.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/unfortunatedefaults.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/unfortunatedefaults.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/unfortunatedefaults.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/unfortunatedefaults.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/unfortunatedefaults.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/unfortunatedefaults.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/unfortunatedefaults.want diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/variants.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/variants.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/variants.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/variants.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/variants.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/variants.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/variants.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/variants.want diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/wrapnewlines.json b/vendor/google.golang.org/api/google-api-go-generator/testdata/wrapnewlines.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/wrapnewlines.json rename to vendor/google.golang.org/api/google-api-go-generator/testdata/wrapnewlines.json diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/wrapnewlines.want b/vendor/google.golang.org/api/google-api-go-generator/testdata/wrapnewlines.want similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/wrapnewlines.want rename to vendor/google.golang.org/api/google-api-go-generator/testdata/wrapnewlines.want diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi.go b/vendor/google.golang.org/api/googleapi/googleapi.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi.go rename to vendor/google.golang.org/api/googleapi/googleapi.go diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi_test.go b/vendor/google.golang.org/api/googleapi/googleapi_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi_test.go rename to vendor/google.golang.org/api/googleapi/googleapi_test.go diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE b/vendor/google.golang.org/api/googleapi/internal/uritemplates/LICENSE similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE rename to vendor/google.golang.org/api/googleapi/internal/uritemplates/LICENSE diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go b/vendor/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go rename to vendor/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/utils.go b/vendor/google.golang.org/api/googleapi/internal/uritemplates/utils.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/utils.go rename to vendor/google.golang.org/api/googleapi/internal/uritemplates/utils.go diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/transport/apikey.go b/vendor/google.golang.org/api/googleapi/transport/apikey.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/googleapi/transport/apikey.go rename to vendor/google.golang.org/api/googleapi/transport/apikey.go diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/types.go b/vendor/google.golang.org/api/googleapi/types.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/googleapi/types.go rename to vendor/google.golang.org/api/googleapi/types.go diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/types_test.go b/vendor/google.golang.org/api/googleapi/types_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/googleapi/types_test.go rename to vendor/google.golang.org/api/googleapi/types_test.go diff --git a/Godeps/_workspace/src/google.golang.org/api/groupsmigration/v1/groupsmigration-api.json b/vendor/google.golang.org/api/groupsmigration/v1/groupsmigration-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/groupsmigration/v1/groupsmigration-api.json rename to vendor/google.golang.org/api/groupsmigration/v1/groupsmigration-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/groupsmigration/v1/groupsmigration-gen.go b/vendor/google.golang.org/api/groupsmigration/v1/groupsmigration-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/groupsmigration/v1/groupsmigration-gen.go rename to vendor/google.golang.org/api/groupsmigration/v1/groupsmigration-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/groupssettings/v1/groupssettings-api.json b/vendor/google.golang.org/api/groupssettings/v1/groupssettings-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/groupssettings/v1/groupssettings-api.json rename to vendor/google.golang.org/api/groupssettings/v1/groupssettings-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/groupssettings/v1/groupssettings-gen.go b/vendor/google.golang.org/api/groupssettings/v1/groupssettings-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/groupssettings/v1/groupssettings-gen.go rename to vendor/google.golang.org/api/groupssettings/v1/groupssettings-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/identitytoolkit/v3/identitytoolkit-api.json b/vendor/google.golang.org/api/identitytoolkit/v3/identitytoolkit-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/identitytoolkit/v3/identitytoolkit-api.json rename to vendor/google.golang.org/api/identitytoolkit/v3/identitytoolkit-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/identitytoolkit/v3/identitytoolkit-gen.go b/vendor/google.golang.org/api/identitytoolkit/v3/identitytoolkit-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/identitytoolkit/v3/identitytoolkit-gen.go rename to vendor/google.golang.org/api/identitytoolkit/v3/identitytoolkit-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/internal/json.go b/vendor/google.golang.org/api/internal/json.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/internal/json.go rename to vendor/google.golang.org/api/internal/json.go diff --git a/Godeps/_workspace/src/google.golang.org/api/internal/json_test.go b/vendor/google.golang.org/api/internal/json_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/internal/json_test.go rename to vendor/google.golang.org/api/internal/json_test.go diff --git a/Godeps/_workspace/src/google.golang.org/api/lib/codereview/codereview.cfg b/vendor/google.golang.org/api/lib/codereview/codereview.cfg similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/lib/codereview/codereview.cfg rename to vendor/google.golang.org/api/lib/codereview/codereview.cfg diff --git a/Godeps/_workspace/src/google.golang.org/api/licensing/v1/licensing-api.json b/vendor/google.golang.org/api/licensing/v1/licensing-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/licensing/v1/licensing-api.json rename to vendor/google.golang.org/api/licensing/v1/licensing-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/licensing/v1/licensing-gen.go b/vendor/google.golang.org/api/licensing/v1/licensing-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/licensing/v1/licensing-gen.go rename to vendor/google.golang.org/api/licensing/v1/licensing-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/logging/v1beta3/logging-api.json b/vendor/google.golang.org/api/logging/v1beta3/logging-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/logging/v1beta3/logging-api.json rename to vendor/google.golang.org/api/logging/v1beta3/logging-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/logging/v1beta3/logging-gen.go b/vendor/google.golang.org/api/logging/v1beta3/logging-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/logging/v1beta3/logging-gen.go rename to vendor/google.golang.org/api/logging/v1beta3/logging-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/logging/v2beta1/logging-api.json b/vendor/google.golang.org/api/logging/v2beta1/logging-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/logging/v2beta1/logging-api.json rename to vendor/google.golang.org/api/logging/v2beta1/logging-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/logging/v2beta1/logging-gen.go b/vendor/google.golang.org/api/logging/v2beta1/logging-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/logging/v2beta1/logging-gen.go rename to vendor/google.golang.org/api/logging/v2beta1/logging-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/manager/v1beta2/manager-api.json b/vendor/google.golang.org/api/manager/v1beta2/manager-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/manager/v1beta2/manager-api.json rename to vendor/google.golang.org/api/manager/v1beta2/manager-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/manager/v1beta2/manager-gen.go b/vendor/google.golang.org/api/manager/v1beta2/manager-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/manager/v1beta2/manager-gen.go rename to vendor/google.golang.org/api/manager/v1beta2/manager-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/mapsengine/exp2/mapsengine-api.json b/vendor/google.golang.org/api/mapsengine/exp2/mapsengine-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/mapsengine/exp2/mapsengine-api.json rename to vendor/google.golang.org/api/mapsengine/exp2/mapsengine-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/mapsengine/exp2/mapsengine-gen.go b/vendor/google.golang.org/api/mapsengine/exp2/mapsengine-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/mapsengine/exp2/mapsengine-gen.go rename to vendor/google.golang.org/api/mapsengine/exp2/mapsengine-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/mapsengine/v1/mapsengine-api.json b/vendor/google.golang.org/api/mapsengine/v1/mapsengine-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/mapsengine/v1/mapsengine-api.json rename to vendor/google.golang.org/api/mapsengine/v1/mapsengine-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/mapsengine/v1/mapsengine-gen.go b/vendor/google.golang.org/api/mapsengine/v1/mapsengine-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/mapsengine/v1/mapsengine-gen.go rename to vendor/google.golang.org/api/mapsengine/v1/mapsengine-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/mirror/v1/mirror-api.json b/vendor/google.golang.org/api/mirror/v1/mirror-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/mirror/v1/mirror-api.json rename to vendor/google.golang.org/api/mirror/v1/mirror-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/mirror/v1/mirror-gen.go b/vendor/google.golang.org/api/mirror/v1/mirror-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/mirror/v1/mirror-gen.go rename to vendor/google.golang.org/api/mirror/v1/mirror-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/oauth2/v1/oauth2-api.json b/vendor/google.golang.org/api/oauth2/v1/oauth2-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/oauth2/v1/oauth2-api.json rename to vendor/google.golang.org/api/oauth2/v1/oauth2-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/oauth2/v1/oauth2-gen.go b/vendor/google.golang.org/api/oauth2/v1/oauth2-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/oauth2/v1/oauth2-gen.go rename to vendor/google.golang.org/api/oauth2/v1/oauth2-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/oauth2/v2/oauth2-api.json b/vendor/google.golang.org/api/oauth2/v2/oauth2-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/oauth2/v2/oauth2-api.json rename to vendor/google.golang.org/api/oauth2/v2/oauth2-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/oauth2/v2/oauth2-gen.go b/vendor/google.golang.org/api/oauth2/v2/oauth2-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/oauth2/v2/oauth2-gen.go rename to vendor/google.golang.org/api/oauth2/v2/oauth2-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/pagespeedonline/v1/pagespeedonline-api.json b/vendor/google.golang.org/api/pagespeedonline/v1/pagespeedonline-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/pagespeedonline/v1/pagespeedonline-api.json rename to vendor/google.golang.org/api/pagespeedonline/v1/pagespeedonline-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/pagespeedonline/v1/pagespeedonline-gen.go b/vendor/google.golang.org/api/pagespeedonline/v1/pagespeedonline-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/pagespeedonline/v1/pagespeedonline-gen.go rename to vendor/google.golang.org/api/pagespeedonline/v1/pagespeedonline-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/pagespeedonline/v2/pagespeedonline-api.json b/vendor/google.golang.org/api/pagespeedonline/v2/pagespeedonline-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/pagespeedonline/v2/pagespeedonline-api.json rename to vendor/google.golang.org/api/pagespeedonline/v2/pagespeedonline-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/pagespeedonline/v2/pagespeedonline-gen.go b/vendor/google.golang.org/api/pagespeedonline/v2/pagespeedonline-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/pagespeedonline/v2/pagespeedonline-gen.go rename to vendor/google.golang.org/api/pagespeedonline/v2/pagespeedonline-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/partners/v2/partners-api.json b/vendor/google.golang.org/api/partners/v2/partners-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/partners/v2/partners-api.json rename to vendor/google.golang.org/api/partners/v2/partners-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/partners/v2/partners-gen.go b/vendor/google.golang.org/api/partners/v2/partners-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/partners/v2/partners-gen.go rename to vendor/google.golang.org/api/partners/v2/partners-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/playmoviespartner/v1/playmoviespartner-api.json b/vendor/google.golang.org/api/playmoviespartner/v1/playmoviespartner-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/playmoviespartner/v1/playmoviespartner-api.json rename to vendor/google.golang.org/api/playmoviespartner/v1/playmoviespartner-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/playmoviespartner/v1/playmoviespartner-gen.go b/vendor/google.golang.org/api/playmoviespartner/v1/playmoviespartner-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/playmoviespartner/v1/playmoviespartner-gen.go rename to vendor/google.golang.org/api/playmoviespartner/v1/playmoviespartner-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/plus/v1/plus-api.json b/vendor/google.golang.org/api/plus/v1/plus-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/plus/v1/plus-api.json rename to vendor/google.golang.org/api/plus/v1/plus-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/plus/v1/plus-gen.go b/vendor/google.golang.org/api/plus/v1/plus-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/plus/v1/plus-gen.go rename to vendor/google.golang.org/api/plus/v1/plus-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/plusdomains/v1/plusdomains-api.json b/vendor/google.golang.org/api/plusdomains/v1/plusdomains-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/plusdomains/v1/plusdomains-api.json rename to vendor/google.golang.org/api/plusdomains/v1/plusdomains-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/plusdomains/v1/plusdomains-gen.go b/vendor/google.golang.org/api/plusdomains/v1/plusdomains-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/plusdomains/v1/plusdomains-gen.go rename to vendor/google.golang.org/api/plusdomains/v1/plusdomains-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/prediction/v1.2/prediction-api.json b/vendor/google.golang.org/api/prediction/v1.2/prediction-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/prediction/v1.2/prediction-api.json rename to vendor/google.golang.org/api/prediction/v1.2/prediction-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/prediction/v1.2/prediction-gen.go b/vendor/google.golang.org/api/prediction/v1.2/prediction-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/prediction/v1.2/prediction-gen.go rename to vendor/google.golang.org/api/prediction/v1.2/prediction-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/prediction/v1.3/prediction-api.json b/vendor/google.golang.org/api/prediction/v1.3/prediction-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/prediction/v1.3/prediction-api.json rename to vendor/google.golang.org/api/prediction/v1.3/prediction-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/prediction/v1.3/prediction-gen.go b/vendor/google.golang.org/api/prediction/v1.3/prediction-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/prediction/v1.3/prediction-gen.go rename to vendor/google.golang.org/api/prediction/v1.3/prediction-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/prediction/v1.4/prediction-api.json b/vendor/google.golang.org/api/prediction/v1.4/prediction-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/prediction/v1.4/prediction-api.json rename to vendor/google.golang.org/api/prediction/v1.4/prediction-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/prediction/v1.4/prediction-gen.go b/vendor/google.golang.org/api/prediction/v1.4/prediction-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/prediction/v1.4/prediction-gen.go rename to vendor/google.golang.org/api/prediction/v1.4/prediction-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/proximitybeacon/v1beta1/proximitybeacon-api.json b/vendor/google.golang.org/api/proximitybeacon/v1beta1/proximitybeacon-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/proximitybeacon/v1beta1/proximitybeacon-api.json rename to vendor/google.golang.org/api/proximitybeacon/v1beta1/proximitybeacon-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/proximitybeacon/v1beta1/proximitybeacon-gen.go b/vendor/google.golang.org/api/proximitybeacon/v1beta1/proximitybeacon-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/proximitybeacon/v1beta1/proximitybeacon-gen.go rename to vendor/google.golang.org/api/proximitybeacon/v1beta1/proximitybeacon-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/pubsub/v1/pubsub-api.json b/vendor/google.golang.org/api/pubsub/v1/pubsub-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/pubsub/v1/pubsub-api.json rename to vendor/google.golang.org/api/pubsub/v1/pubsub-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/pubsub/v1/pubsub-gen.go b/vendor/google.golang.org/api/pubsub/v1/pubsub-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/pubsub/v1/pubsub-gen.go rename to vendor/google.golang.org/api/pubsub/v1/pubsub-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/pubsub/v1beta1/pubsub-api.json b/vendor/google.golang.org/api/pubsub/v1beta1/pubsub-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/pubsub/v1beta1/pubsub-api.json rename to vendor/google.golang.org/api/pubsub/v1beta1/pubsub-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/pubsub/v1beta1/pubsub-gen.go b/vendor/google.golang.org/api/pubsub/v1beta1/pubsub-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/pubsub/v1beta1/pubsub-gen.go rename to vendor/google.golang.org/api/pubsub/v1beta1/pubsub-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/pubsub/v1beta1a/pubsub-api.json b/vendor/google.golang.org/api/pubsub/v1beta1a/pubsub-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/pubsub/v1beta1a/pubsub-api.json rename to vendor/google.golang.org/api/pubsub/v1beta1a/pubsub-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/pubsub/v1beta1a/pubsub-gen.go b/vendor/google.golang.org/api/pubsub/v1beta1a/pubsub-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/pubsub/v1beta1a/pubsub-gen.go rename to vendor/google.golang.org/api/pubsub/v1beta1a/pubsub-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/pubsub/v1beta2/pubsub-api.json b/vendor/google.golang.org/api/pubsub/v1beta2/pubsub-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/pubsub/v1beta2/pubsub-api.json rename to vendor/google.golang.org/api/pubsub/v1beta2/pubsub-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/pubsub/v1beta2/pubsub-gen.go b/vendor/google.golang.org/api/pubsub/v1beta2/pubsub-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/pubsub/v1beta2/pubsub-gen.go rename to vendor/google.golang.org/api/pubsub/v1beta2/pubsub-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/qpxexpress/v1/qpxexpress-api.json b/vendor/google.golang.org/api/qpxexpress/v1/qpxexpress-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/qpxexpress/v1/qpxexpress-api.json rename to vendor/google.golang.org/api/qpxexpress/v1/qpxexpress-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/qpxexpress/v1/qpxexpress-gen.go b/vendor/google.golang.org/api/qpxexpress/v1/qpxexpress-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/qpxexpress/v1/qpxexpress-gen.go rename to vendor/google.golang.org/api/qpxexpress/v1/qpxexpress-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/replicapool/v1beta1/replicapool-api.json b/vendor/google.golang.org/api/replicapool/v1beta1/replicapool-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/replicapool/v1beta1/replicapool-api.json rename to vendor/google.golang.org/api/replicapool/v1beta1/replicapool-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/replicapool/v1beta1/replicapool-gen.go b/vendor/google.golang.org/api/replicapool/v1beta1/replicapool-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/replicapool/v1beta1/replicapool-gen.go rename to vendor/google.golang.org/api/replicapool/v1beta1/replicapool-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/replicapool/v1beta2/replicapool-api.json b/vendor/google.golang.org/api/replicapool/v1beta2/replicapool-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/replicapool/v1beta2/replicapool-api.json rename to vendor/google.golang.org/api/replicapool/v1beta2/replicapool-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/replicapool/v1beta2/replicapool-gen.go b/vendor/google.golang.org/api/replicapool/v1beta2/replicapool-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/replicapool/v1beta2/replicapool-gen.go rename to vendor/google.golang.org/api/replicapool/v1beta2/replicapool-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/replicapoolupdater/v1beta1/replicapoolupdater-api.json b/vendor/google.golang.org/api/replicapoolupdater/v1beta1/replicapoolupdater-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/replicapoolupdater/v1beta1/replicapoolupdater-api.json rename to vendor/google.golang.org/api/replicapoolupdater/v1beta1/replicapoolupdater-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/replicapoolupdater/v1beta1/replicapoolupdater-gen.go b/vendor/google.golang.org/api/replicapoolupdater/v1beta1/replicapoolupdater-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/replicapoolupdater/v1beta1/replicapoolupdater-gen.go rename to vendor/google.golang.org/api/replicapoolupdater/v1beta1/replicapoolupdater-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/reseller/v1/reseller-api.json b/vendor/google.golang.org/api/reseller/v1/reseller-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/reseller/v1/reseller-api.json rename to vendor/google.golang.org/api/reseller/v1/reseller-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/reseller/v1/reseller-gen.go b/vendor/google.golang.org/api/reseller/v1/reseller-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/reseller/v1/reseller-gen.go rename to vendor/google.golang.org/api/reseller/v1/reseller-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/reseller/v1sandbox/reseller-api.json b/vendor/google.golang.org/api/reseller/v1sandbox/reseller-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/reseller/v1sandbox/reseller-api.json rename to vendor/google.golang.org/api/reseller/v1sandbox/reseller-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/reseller/v1sandbox/reseller-gen.go b/vendor/google.golang.org/api/reseller/v1sandbox/reseller-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/reseller/v1sandbox/reseller-gen.go rename to vendor/google.golang.org/api/reseller/v1sandbox/reseller-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/resourceviews/v1beta1/resourceviews-api.json b/vendor/google.golang.org/api/resourceviews/v1beta1/resourceviews-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/resourceviews/v1beta1/resourceviews-api.json rename to vendor/google.golang.org/api/resourceviews/v1beta1/resourceviews-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/resourceviews/v1beta1/resourceviews-gen.go b/vendor/google.golang.org/api/resourceviews/v1beta1/resourceviews-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/resourceviews/v1beta1/resourceviews-gen.go rename to vendor/google.golang.org/api/resourceviews/v1beta1/resourceviews-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/resourceviews/v1beta2/resourceviews-api.json b/vendor/google.golang.org/api/resourceviews/v1beta2/resourceviews-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/resourceviews/v1beta2/resourceviews-api.json rename to vendor/google.golang.org/api/resourceviews/v1beta2/resourceviews-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/resourceviews/v1beta2/resourceviews-gen.go b/vendor/google.golang.org/api/resourceviews/v1beta2/resourceviews-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/resourceviews/v1beta2/resourceviews-gen.go rename to vendor/google.golang.org/api/resourceviews/v1beta2/resourceviews-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/script/v1/script-api.json b/vendor/google.golang.org/api/script/v1/script-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/script/v1/script-api.json rename to vendor/google.golang.org/api/script/v1/script-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/script/v1/script-gen.go b/vendor/google.golang.org/api/script/v1/script-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/script/v1/script-gen.go rename to vendor/google.golang.org/api/script/v1/script-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/siteverification/v1/siteverification-api.json b/vendor/google.golang.org/api/siteverification/v1/siteverification-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/siteverification/v1/siteverification-api.json rename to vendor/google.golang.org/api/siteverification/v1/siteverification-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/siteverification/v1/siteverification-gen.go b/vendor/google.golang.org/api/siteverification/v1/siteverification-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/siteverification/v1/siteverification-gen.go rename to vendor/google.golang.org/api/siteverification/v1/siteverification-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/spectrum/v1explorer/spectrum-api.json b/vendor/google.golang.org/api/spectrum/v1explorer/spectrum-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/spectrum/v1explorer/spectrum-api.json rename to vendor/google.golang.org/api/spectrum/v1explorer/spectrum-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/spectrum/v1explorer/spectrum-gen.go b/vendor/google.golang.org/api/spectrum/v1explorer/spectrum-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/spectrum/v1explorer/spectrum-gen.go rename to vendor/google.golang.org/api/spectrum/v1explorer/spectrum-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/sqladmin/v1beta3/sqladmin-api.json b/vendor/google.golang.org/api/sqladmin/v1beta3/sqladmin-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/sqladmin/v1beta3/sqladmin-api.json rename to vendor/google.golang.org/api/sqladmin/v1beta3/sqladmin-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/sqladmin/v1beta3/sqladmin-gen.go b/vendor/google.golang.org/api/sqladmin/v1beta3/sqladmin-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/sqladmin/v1beta3/sqladmin-gen.go rename to vendor/google.golang.org/api/sqladmin/v1beta3/sqladmin-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/sqladmin/v1beta4/sqladmin-api.json b/vendor/google.golang.org/api/sqladmin/v1beta4/sqladmin-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/sqladmin/v1beta4/sqladmin-api.json rename to vendor/google.golang.org/api/sqladmin/v1beta4/sqladmin-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/sqladmin/v1beta4/sqladmin-gen.go b/vendor/google.golang.org/api/sqladmin/v1beta4/sqladmin-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/sqladmin/v1beta4/sqladmin-gen.go rename to vendor/google.golang.org/api/sqladmin/v1beta4/sqladmin-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/storage/v1/storage-api.json b/vendor/google.golang.org/api/storage/v1/storage-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/storage/v1/storage-api.json rename to vendor/google.golang.org/api/storage/v1/storage-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/storage/v1/storage-gen.go b/vendor/google.golang.org/api/storage/v1/storage-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/storage/v1/storage-gen.go rename to vendor/google.golang.org/api/storage/v1/storage-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/storage/v1beta1/storage-api.json b/vendor/google.golang.org/api/storage/v1beta1/storage-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/storage/v1beta1/storage-api.json rename to vendor/google.golang.org/api/storage/v1beta1/storage-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/storage/v1beta1/storage-gen.go b/vendor/google.golang.org/api/storage/v1beta1/storage-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/storage/v1beta1/storage-gen.go rename to vendor/google.golang.org/api/storage/v1beta1/storage-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/storage/v1beta2/storage-api.json b/vendor/google.golang.org/api/storage/v1beta2/storage-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/storage/v1beta2/storage-api.json rename to vendor/google.golang.org/api/storage/v1beta2/storage-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/storage/v1beta2/storage-gen.go b/vendor/google.golang.org/api/storage/v1beta2/storage-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/storage/v1beta2/storage-gen.go rename to vendor/google.golang.org/api/storage/v1beta2/storage-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/storagetransfer/v1/storagetransfer-api.json b/vendor/google.golang.org/api/storagetransfer/v1/storagetransfer-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/storagetransfer/v1/storagetransfer-api.json rename to vendor/google.golang.org/api/storagetransfer/v1/storagetransfer-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/storagetransfer/v1/storagetransfer-gen.go b/vendor/google.golang.org/api/storagetransfer/v1/storagetransfer-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/storagetransfer/v1/storagetransfer-gen.go rename to vendor/google.golang.org/api/storagetransfer/v1/storagetransfer-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/tagmanager/v1/tagmanager-api.json b/vendor/google.golang.org/api/tagmanager/v1/tagmanager-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/tagmanager/v1/tagmanager-api.json rename to vendor/google.golang.org/api/tagmanager/v1/tagmanager-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/tagmanager/v1/tagmanager-gen.go b/vendor/google.golang.org/api/tagmanager/v1/tagmanager-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/tagmanager/v1/tagmanager-gen.go rename to vendor/google.golang.org/api/tagmanager/v1/tagmanager-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/taskqueue/v1beta1/taskqueue-api.json b/vendor/google.golang.org/api/taskqueue/v1beta1/taskqueue-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/taskqueue/v1beta1/taskqueue-api.json rename to vendor/google.golang.org/api/taskqueue/v1beta1/taskqueue-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/taskqueue/v1beta1/taskqueue-gen.go b/vendor/google.golang.org/api/taskqueue/v1beta1/taskqueue-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/taskqueue/v1beta1/taskqueue-gen.go rename to vendor/google.golang.org/api/taskqueue/v1beta1/taskqueue-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/taskqueue/v1beta2/taskqueue-api.json b/vendor/google.golang.org/api/taskqueue/v1beta2/taskqueue-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/taskqueue/v1beta2/taskqueue-api.json rename to vendor/google.golang.org/api/taskqueue/v1beta2/taskqueue-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/taskqueue/v1beta2/taskqueue-gen.go b/vendor/google.golang.org/api/taskqueue/v1beta2/taskqueue-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/taskqueue/v1beta2/taskqueue-gen.go rename to vendor/google.golang.org/api/taskqueue/v1beta2/taskqueue-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/tasks/v1/tasks-api.json b/vendor/google.golang.org/api/tasks/v1/tasks-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/tasks/v1/tasks-api.json rename to vendor/google.golang.org/api/tasks/v1/tasks-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/tasks/v1/tasks-gen.go b/vendor/google.golang.org/api/tasks/v1/tasks-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/tasks/v1/tasks-gen.go rename to vendor/google.golang.org/api/tasks/v1/tasks-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/translate/v2/translate-api.json b/vendor/google.golang.org/api/translate/v2/translate-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/translate/v2/translate-api.json rename to vendor/google.golang.org/api/translate/v2/translate-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/translate/v2/translate-gen.go b/vendor/google.golang.org/api/translate/v2/translate-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/translate/v2/translate-gen.go rename to vendor/google.golang.org/api/translate/v2/translate-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/urlshortener/v1/urlshortener-api.json b/vendor/google.golang.org/api/urlshortener/v1/urlshortener-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/urlshortener/v1/urlshortener-api.json rename to vendor/google.golang.org/api/urlshortener/v1/urlshortener-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/urlshortener/v1/urlshortener-gen.go b/vendor/google.golang.org/api/urlshortener/v1/urlshortener-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/urlshortener/v1/urlshortener-gen.go rename to vendor/google.golang.org/api/urlshortener/v1/urlshortener-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/webfonts/v1/webfonts-api.json b/vendor/google.golang.org/api/webfonts/v1/webfonts-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/webfonts/v1/webfonts-api.json rename to vendor/google.golang.org/api/webfonts/v1/webfonts-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/webfonts/v1/webfonts-gen.go b/vendor/google.golang.org/api/webfonts/v1/webfonts-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/webfonts/v1/webfonts-gen.go rename to vendor/google.golang.org/api/webfonts/v1/webfonts-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/webmasters/v3/webmasters-api.json b/vendor/google.golang.org/api/webmasters/v3/webmasters-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/webmasters/v3/webmasters-api.json rename to vendor/google.golang.org/api/webmasters/v3/webmasters-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/webmasters/v3/webmasters-gen.go b/vendor/google.golang.org/api/webmasters/v3/webmasters-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/webmasters/v3/webmasters-gen.go rename to vendor/google.golang.org/api/webmasters/v3/webmasters-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/youtube/v3/youtube-api.json b/vendor/google.golang.org/api/youtube/v3/youtube-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/youtube/v3/youtube-api.json rename to vendor/google.golang.org/api/youtube/v3/youtube-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/youtube/v3/youtube-gen.go b/vendor/google.golang.org/api/youtube/v3/youtube-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/youtube/v3/youtube-gen.go rename to vendor/google.golang.org/api/youtube/v3/youtube-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/youtubeanalytics/v1/youtubeanalytics-api.json b/vendor/google.golang.org/api/youtubeanalytics/v1/youtubeanalytics-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/youtubeanalytics/v1/youtubeanalytics-api.json rename to vendor/google.golang.org/api/youtubeanalytics/v1/youtubeanalytics-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/youtubeanalytics/v1/youtubeanalytics-gen.go b/vendor/google.golang.org/api/youtubeanalytics/v1/youtubeanalytics-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/youtubeanalytics/v1/youtubeanalytics-gen.go rename to vendor/google.golang.org/api/youtubeanalytics/v1/youtubeanalytics-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/youtubeanalytics/v1beta1/youtubeanalytics-api.json b/vendor/google.golang.org/api/youtubeanalytics/v1beta1/youtubeanalytics-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/youtubeanalytics/v1beta1/youtubeanalytics-api.json rename to vendor/google.golang.org/api/youtubeanalytics/v1beta1/youtubeanalytics-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/youtubeanalytics/v1beta1/youtubeanalytics-gen.go b/vendor/google.golang.org/api/youtubeanalytics/v1beta1/youtubeanalytics-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/youtubeanalytics/v1beta1/youtubeanalytics-gen.go rename to vendor/google.golang.org/api/youtubeanalytics/v1beta1/youtubeanalytics-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/api/youtubereporting/v1/youtubereporting-api.json b/vendor/google.golang.org/api/youtubereporting/v1/youtubereporting-api.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/youtubereporting/v1/youtubereporting-api.json rename to vendor/google.golang.org/api/youtubereporting/v1/youtubereporting-api.json diff --git a/Godeps/_workspace/src/google.golang.org/api/youtubereporting/v1/youtubereporting-gen.go b/vendor/google.golang.org/api/youtubereporting/v1/youtubereporting-gen.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/api/youtubereporting/v1/youtubereporting-gen.go rename to vendor/google.golang.org/api/youtubereporting/v1/youtubereporting-gen.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/.travis.yml b/vendor/google.golang.org/cloud/.travis.yml similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/.travis.yml rename to vendor/google.golang.org/cloud/.travis.yml diff --git a/Godeps/_workspace/src/google.golang.org/cloud/AUTHORS b/vendor/google.golang.org/cloud/AUTHORS similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/AUTHORS rename to vendor/google.golang.org/cloud/AUTHORS diff --git a/Godeps/_workspace/src/google.golang.org/cloud/CONTRIBUTING.md b/vendor/google.golang.org/cloud/CONTRIBUTING.md similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/CONTRIBUTING.md rename to vendor/google.golang.org/cloud/CONTRIBUTING.md diff --git a/Godeps/_workspace/src/google.golang.org/cloud/CONTRIBUTORS b/vendor/google.golang.org/cloud/CONTRIBUTORS similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/CONTRIBUTORS rename to vendor/google.golang.org/cloud/CONTRIBUTORS diff --git a/Godeps/_workspace/src/google.golang.org/cloud/LICENSE b/vendor/google.golang.org/cloud/LICENSE similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/LICENSE rename to vendor/google.golang.org/cloud/LICENSE diff --git a/Godeps/_workspace/src/google.golang.org/cloud/README.md b/vendor/google.golang.org/cloud/README.md similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/README.md rename to vendor/google.golang.org/cloud/README.md diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/bigquery.go b/vendor/google.golang.org/cloud/bigquery/bigquery.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/bigquery.go rename to vendor/google.golang.org/cloud/bigquery/bigquery.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/copy_op.go b/vendor/google.golang.org/cloud/bigquery/copy_op.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/copy_op.go rename to vendor/google.golang.org/cloud/bigquery/copy_op.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/copy_test.go b/vendor/google.golang.org/cloud/bigquery/copy_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/copy_test.go rename to vendor/google.golang.org/cloud/bigquery/copy_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/create_table_test.go b/vendor/google.golang.org/cloud/bigquery/create_table_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/create_table_test.go rename to vendor/google.golang.org/cloud/bigquery/create_table_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/dataset.go b/vendor/google.golang.org/cloud/bigquery/dataset.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/dataset.go rename to vendor/google.golang.org/cloud/bigquery/dataset.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/dataset_test.go b/vendor/google.golang.org/cloud/bigquery/dataset_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/dataset_test.go rename to vendor/google.golang.org/cloud/bigquery/dataset_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/doc.go b/vendor/google.golang.org/cloud/bigquery/doc.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/doc.go rename to vendor/google.golang.org/cloud/bigquery/doc.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/error.go b/vendor/google.golang.org/cloud/bigquery/error.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/error.go rename to vendor/google.golang.org/cloud/bigquery/error.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/extract_op.go b/vendor/google.golang.org/cloud/bigquery/extract_op.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/extract_op.go rename to vendor/google.golang.org/cloud/bigquery/extract_op.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/extract_test.go b/vendor/google.golang.org/cloud/bigquery/extract_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/extract_test.go rename to vendor/google.golang.org/cloud/bigquery/extract_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/gcs.go b/vendor/google.golang.org/cloud/bigquery/gcs.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/gcs.go rename to vendor/google.golang.org/cloud/bigquery/gcs.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/iterator.go b/vendor/google.golang.org/cloud/bigquery/iterator.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/iterator.go rename to vendor/google.golang.org/cloud/bigquery/iterator.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/iterator_test.go b/vendor/google.golang.org/cloud/bigquery/iterator_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/iterator_test.go rename to vendor/google.golang.org/cloud/bigquery/iterator_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/job.go b/vendor/google.golang.org/cloud/bigquery/job.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/job.go rename to vendor/google.golang.org/cloud/bigquery/job.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/load_op.go b/vendor/google.golang.org/cloud/bigquery/load_op.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/load_op.go rename to vendor/google.golang.org/cloud/bigquery/load_op.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/load_test.go b/vendor/google.golang.org/cloud/bigquery/load_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/load_test.go rename to vendor/google.golang.org/cloud/bigquery/load_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/query.go b/vendor/google.golang.org/cloud/bigquery/query.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/query.go rename to vendor/google.golang.org/cloud/bigquery/query.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/query_op.go b/vendor/google.golang.org/cloud/bigquery/query_op.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/query_op.go rename to vendor/google.golang.org/cloud/bigquery/query_op.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/query_test.go b/vendor/google.golang.org/cloud/bigquery/query_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/query_test.go rename to vendor/google.golang.org/cloud/bigquery/query_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/read_op.go b/vendor/google.golang.org/cloud/bigquery/read_op.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/read_op.go rename to vendor/google.golang.org/cloud/bigquery/read_op.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/read_test.go b/vendor/google.golang.org/cloud/bigquery/read_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/read_test.go rename to vendor/google.golang.org/cloud/bigquery/read_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/schema.go b/vendor/google.golang.org/cloud/bigquery/schema.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/schema.go rename to vendor/google.golang.org/cloud/bigquery/schema.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/schema_test.go b/vendor/google.golang.org/cloud/bigquery/schema_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/schema_test.go rename to vendor/google.golang.org/cloud/bigquery/schema_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/service.go b/vendor/google.golang.org/cloud/bigquery/service.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/service.go rename to vendor/google.golang.org/cloud/bigquery/service.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/table.go b/vendor/google.golang.org/cloud/bigquery/table.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/table.go rename to vendor/google.golang.org/cloud/bigquery/table.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/utils_test.go b/vendor/google.golang.org/cloud/bigquery/utils_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/utils_test.go rename to vendor/google.golang.org/cloud/bigquery/utils_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/value.go b/vendor/google.golang.org/cloud/bigquery/value.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/value.go rename to vendor/google.golang.org/cloud/bigquery/value.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigquery/value_test.go b/vendor/google.golang.org/cloud/bigquery/value_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigquery/value_test.go rename to vendor/google.golang.org/cloud/bigquery/value_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/admin.go b/vendor/google.golang.org/cloud/bigtable/admin.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/admin.go rename to vendor/google.golang.org/cloud/bigtable/admin.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/admin_test.go b/vendor/google.golang.org/cloud/bigtable/admin_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/admin_test.go rename to vendor/google.golang.org/cloud/bigtable/admin_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/bigtable.go b/vendor/google.golang.org/cloud/bigtable/bigtable.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/bigtable.go rename to vendor/google.golang.org/cloud/bigtable/bigtable.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/bigtable_test.go b/vendor/google.golang.org/cloud/bigtable/bigtable_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/bigtable_test.go rename to vendor/google.golang.org/cloud/bigtable/bigtable_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/bttest/inmem.go b/vendor/google.golang.org/cloud/bigtable/bttest/inmem.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/bttest/inmem.go rename to vendor/google.golang.org/cloud/bigtable/bttest/inmem.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/cmd/cbt/cbt.go b/vendor/google.golang.org/cloud/bigtable/cmd/cbt/cbt.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/cmd/cbt/cbt.go rename to vendor/google.golang.org/cloud/bigtable/cmd/cbt/cbt.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/cmd/cbt/cbtdoc.go b/vendor/google.golang.org/cloud/bigtable/cmd/cbt/cbtdoc.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/cmd/cbt/cbtdoc.go rename to vendor/google.golang.org/cloud/bigtable/cmd/cbt/cbtdoc.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/cmd/loadtest/loadtest.go b/vendor/google.golang.org/cloud/bigtable/cmd/loadtest/loadtest.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/cmd/loadtest/loadtest.go rename to vendor/google.golang.org/cloud/bigtable/cmd/loadtest/loadtest.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/cmd/loadtest/stats.go b/vendor/google.golang.org/cloud/bigtable/cmd/loadtest/stats.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/cmd/loadtest/stats.go rename to vendor/google.golang.org/cloud/bigtable/cmd/loadtest/stats.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/doc.go b/vendor/google.golang.org/cloud/bigtable/doc.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/doc.go rename to vendor/google.golang.org/cloud/bigtable/doc.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/filter.go b/vendor/google.golang.org/cloud/bigtable/filter.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/filter.go rename to vendor/google.golang.org/cloud/bigtable/filter.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/gc.go b/vendor/google.golang.org/cloud/bigtable/gc.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/gc.go rename to vendor/google.golang.org/cloud/bigtable/gc.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/cbtrc/cbtrc.go b/vendor/google.golang.org/cloud/bigtable/internal/cbtrc/cbtrc.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/cbtrc/cbtrc.go rename to vendor/google.golang.org/cloud/bigtable/internal/cbtrc/cbtrc.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/cluster_data_proto/bigtable_cluster_data.pb.go b/vendor/google.golang.org/cloud/bigtable/internal/cluster_data_proto/bigtable_cluster_data.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/cluster_data_proto/bigtable_cluster_data.pb.go rename to vendor/google.golang.org/cloud/bigtable/internal/cluster_data_proto/bigtable_cluster_data.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/cluster_data_proto/bigtable_cluster_data.proto b/vendor/google.golang.org/cloud/bigtable/internal/cluster_data_proto/bigtable_cluster_data.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/cluster_data_proto/bigtable_cluster_data.proto rename to vendor/google.golang.org/cloud/bigtable/internal/cluster_data_proto/bigtable_cluster_data.proto diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service.pb.go b/vendor/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service.pb.go rename to vendor/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service.proto b/vendor/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service.proto rename to vendor/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service.proto diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service_messages.pb.go b/vendor/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service_messages.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service_messages.pb.go rename to vendor/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service_messages.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service_messages.proto b/vendor/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service_messages.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service_messages.proto rename to vendor/google.golang.org/cloud/bigtable/internal/cluster_service_proto/bigtable_cluster_service_messages.proto diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/data_proto/bigtable_data.pb.go b/vendor/google.golang.org/cloud/bigtable/internal/data_proto/bigtable_data.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/data_proto/bigtable_data.pb.go rename to vendor/google.golang.org/cloud/bigtable/internal/data_proto/bigtable_data.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/data_proto/bigtable_data.proto b/vendor/google.golang.org/cloud/bigtable/internal/data_proto/bigtable_data.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/data_proto/bigtable_data.proto rename to vendor/google.golang.org/cloud/bigtable/internal/data_proto/bigtable_data.proto diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/duration_proto/duration.pb.go b/vendor/google.golang.org/cloud/bigtable/internal/duration_proto/duration.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/duration_proto/duration.pb.go rename to vendor/google.golang.org/cloud/bigtable/internal/duration_proto/duration.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/duration_proto/duration.proto b/vendor/google.golang.org/cloud/bigtable/internal/duration_proto/duration.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/duration_proto/duration.proto rename to vendor/google.golang.org/cloud/bigtable/internal/duration_proto/duration.proto diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/empty/empty.pb.go b/vendor/google.golang.org/cloud/bigtable/internal/empty/empty.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/empty/empty.pb.go rename to vendor/google.golang.org/cloud/bigtable/internal/empty/empty.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/empty/empty.proto b/vendor/google.golang.org/cloud/bigtable/internal/empty/empty.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/empty/empty.proto rename to vendor/google.golang.org/cloud/bigtable/internal/empty/empty.proto diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/regen.sh b/vendor/google.golang.org/cloud/bigtable/internal/regen.sh similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/regen.sh rename to vendor/google.golang.org/cloud/bigtable/internal/regen.sh diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service.pb.go b/vendor/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service.pb.go rename to vendor/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service.proto b/vendor/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service.proto rename to vendor/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service.proto diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service_messages.pb.go b/vendor/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service_messages.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service_messages.pb.go rename to vendor/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service_messages.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service_messages.proto b/vendor/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service_messages.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service_messages.proto rename to vendor/google.golang.org/cloud/bigtable/internal/service_proto/bigtable_service_messages.proto diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/table_data_proto/bigtable_table_data.pb.go b/vendor/google.golang.org/cloud/bigtable/internal/table_data_proto/bigtable_table_data.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/table_data_proto/bigtable_table_data.pb.go rename to vendor/google.golang.org/cloud/bigtable/internal/table_data_proto/bigtable_table_data.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/table_data_proto/bigtable_table_data.proto b/vendor/google.golang.org/cloud/bigtable/internal/table_data_proto/bigtable_table_data.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/table_data_proto/bigtable_table_data.proto rename to vendor/google.golang.org/cloud/bigtable/internal/table_data_proto/bigtable_table_data.proto diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service.pb.go b/vendor/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service.pb.go rename to vendor/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service.proto b/vendor/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service.proto rename to vendor/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service.proto diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service_messages.pb.go b/vendor/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service_messages.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service_messages.pb.go rename to vendor/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service_messages.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service_messages.proto b/vendor/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service_messages.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service_messages.proto rename to vendor/google.golang.org/cloud/bigtable/internal/table_service_proto/bigtable_table_service_messages.proto diff --git a/Godeps/_workspace/src/google.golang.org/cloud/cloud.go b/vendor/google.golang.org/cloud/cloud.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/cloud.go rename to vendor/google.golang.org/cloud/cloud.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/cloud_test.go b/vendor/google.golang.org/cloud/cloud_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/cloud_test.go rename to vendor/google.golang.org/cloud/cloud_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/compute/metadata/metadata.go b/vendor/google.golang.org/cloud/compute/metadata/metadata.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/compute/metadata/metadata.go rename to vendor/google.golang.org/cloud/compute/metadata/metadata.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/container/container.go b/vendor/google.golang.org/cloud/container/container.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/container/container.go rename to vendor/google.golang.org/cloud/container/container.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/datastore.go b/vendor/google.golang.org/cloud/datastore/datastore.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/datastore.go rename to vendor/google.golang.org/cloud/datastore/datastore.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/datastore_test.go b/vendor/google.golang.org/cloud/datastore/datastore_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/datastore_test.go rename to vendor/google.golang.org/cloud/datastore/datastore_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/errors.go b/vendor/google.golang.org/cloud/datastore/errors.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/errors.go rename to vendor/google.golang.org/cloud/datastore/errors.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/example_test.go b/vendor/google.golang.org/cloud/datastore/example_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/example_test.go rename to vendor/google.golang.org/cloud/datastore/example_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/integration_test.go b/vendor/google.golang.org/cloud/datastore/integration_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/integration_test.go rename to vendor/google.golang.org/cloud/datastore/integration_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/key.go b/vendor/google.golang.org/cloud/datastore/key.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/key.go rename to vendor/google.golang.org/cloud/datastore/key.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/key_test.go b/vendor/google.golang.org/cloud/datastore/key_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/key_test.go rename to vendor/google.golang.org/cloud/datastore/key_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/load.go b/vendor/google.golang.org/cloud/datastore/load.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/load.go rename to vendor/google.golang.org/cloud/datastore/load.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/prop.go b/vendor/google.golang.org/cloud/datastore/prop.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/prop.go rename to vendor/google.golang.org/cloud/datastore/prop.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/query.go b/vendor/google.golang.org/cloud/datastore/query.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/query.go rename to vendor/google.golang.org/cloud/datastore/query.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/query_test.go b/vendor/google.golang.org/cloud/datastore/query_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/query_test.go rename to vendor/google.golang.org/cloud/datastore/query_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/save.go b/vendor/google.golang.org/cloud/datastore/save.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/save.go rename to vendor/google.golang.org/cloud/datastore/save.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/testdata/index.yaml b/vendor/google.golang.org/cloud/datastore/testdata/index.yaml similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/testdata/index.yaml rename to vendor/google.golang.org/cloud/datastore/testdata/index.yaml diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/time.go b/vendor/google.golang.org/cloud/datastore/time.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/time.go rename to vendor/google.golang.org/cloud/datastore/time.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/time_test.go b/vendor/google.golang.org/cloud/datastore/time_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/time_test.go rename to vendor/google.golang.org/cloud/datastore/time_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/datastore/transaction.go b/vendor/google.golang.org/cloud/datastore/transaction.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/datastore/transaction.go rename to vendor/google.golang.org/cloud/datastore/transaction.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/examples/bigquery/concat_table/main.go b/vendor/google.golang.org/cloud/examples/bigquery/concat_table/main.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/examples/bigquery/concat_table/main.go rename to vendor/google.golang.org/cloud/examples/bigquery/concat_table/main.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/examples/bigquery/load/main.go b/vendor/google.golang.org/cloud/examples/bigquery/load/main.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/examples/bigquery/load/main.go rename to vendor/google.golang.org/cloud/examples/bigquery/load/main.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/examples/bigquery/query/main.go b/vendor/google.golang.org/cloud/examples/bigquery/query/main.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/examples/bigquery/query/main.go rename to vendor/google.golang.org/cloud/examples/bigquery/query/main.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/examples/bigquery/read/main.go b/vendor/google.golang.org/cloud/examples/bigquery/read/main.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/examples/bigquery/read/main.go rename to vendor/google.golang.org/cloud/examples/bigquery/read/main.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/examples/bigtable/bigtable-hello/README.md b/vendor/google.golang.org/cloud/examples/bigtable/bigtable-hello/README.md similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/examples/bigtable/bigtable-hello/README.md rename to vendor/google.golang.org/cloud/examples/bigtable/bigtable-hello/README.md diff --git a/Godeps/_workspace/src/google.golang.org/cloud/examples/bigtable/bigtable-hello/app.yaml b/vendor/google.golang.org/cloud/examples/bigtable/bigtable-hello/app.yaml similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/examples/bigtable/bigtable-hello/app.yaml rename to vendor/google.golang.org/cloud/examples/bigtable/bigtable-hello/app.yaml diff --git a/Godeps/_workspace/src/google.golang.org/cloud/examples/bigtable/bigtable-hello/helloworld.go b/vendor/google.golang.org/cloud/examples/bigtable/bigtable-hello/helloworld.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/examples/bigtable/bigtable-hello/helloworld.go rename to vendor/google.golang.org/cloud/examples/bigtable/bigtable-hello/helloworld.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/examples/bigtable/search/search.go b/vendor/google.golang.org/cloud/examples/bigtable/search/search.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/examples/bigtable/search/search.go rename to vendor/google.golang.org/cloud/examples/bigtable/search/search.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/examples/pubsub/cmdline/main.go b/vendor/google.golang.org/cloud/examples/pubsub/cmdline/main.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/examples/pubsub/cmdline/main.go rename to vendor/google.golang.org/cloud/examples/pubsub/cmdline/main.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/examples/storage/appengine/app.go b/vendor/google.golang.org/cloud/examples/storage/appengine/app.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/examples/storage/appengine/app.go rename to vendor/google.golang.org/cloud/examples/storage/appengine/app.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/examples/storage/appengine/app.yaml b/vendor/google.golang.org/cloud/examples/storage/appengine/app.yaml similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/examples/storage/appengine/app.yaml rename to vendor/google.golang.org/cloud/examples/storage/appengine/app.yaml diff --git a/Godeps/_workspace/src/google.golang.org/cloud/examples/storage/appenginevm/app.go b/vendor/google.golang.org/cloud/examples/storage/appenginevm/app.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/examples/storage/appenginevm/app.go rename to vendor/google.golang.org/cloud/examples/storage/appenginevm/app.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/examples/storage/appenginevm/app.yaml b/vendor/google.golang.org/cloud/examples/storage/appenginevm/app.yaml similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/examples/storage/appenginevm/app.yaml rename to vendor/google.golang.org/cloud/examples/storage/appenginevm/app.yaml diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/cloud.go b/vendor/google.golang.org/cloud/internal/cloud.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/internal/cloud.go rename to vendor/google.golang.org/cloud/internal/cloud.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/datastore/datastore_v1.pb.go b/vendor/google.golang.org/cloud/internal/datastore/datastore_v1.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/internal/datastore/datastore_v1.pb.go rename to vendor/google.golang.org/cloud/internal/datastore/datastore_v1.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/datastore/datastore_v1.proto b/vendor/google.golang.org/cloud/internal/datastore/datastore_v1.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/internal/datastore/datastore_v1.proto rename to vendor/google.golang.org/cloud/internal/datastore/datastore_v1.proto diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/opts/option.go b/vendor/google.golang.org/cloud/internal/opts/option.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/internal/opts/option.go rename to vendor/google.golang.org/cloud/internal/opts/option.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/testutil/context.go b/vendor/google.golang.org/cloud/internal/testutil/context.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/internal/testutil/context.go rename to vendor/google.golang.org/cloud/internal/testutil/context.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/transport/cancelreq.go b/vendor/google.golang.org/cloud/internal/transport/cancelreq.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/internal/transport/cancelreq.go rename to vendor/google.golang.org/cloud/internal/transport/cancelreq.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/transport/cancelreq_legacy.go b/vendor/google.golang.org/cloud/internal/transport/cancelreq_legacy.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/internal/transport/cancelreq_legacy.go rename to vendor/google.golang.org/cloud/internal/transport/cancelreq_legacy.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/transport/dial.go b/vendor/google.golang.org/cloud/internal/transport/dial.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/internal/transport/dial.go rename to vendor/google.golang.org/cloud/internal/transport/dial.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/transport/proto.go b/vendor/google.golang.org/cloud/internal/transport/proto.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/internal/transport/proto.go rename to vendor/google.golang.org/cloud/internal/transport/proto.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/key.json.enc b/vendor/google.golang.org/cloud/key.json.enc similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/key.json.enc rename to vendor/google.golang.org/cloud/key.json.enc diff --git a/Godeps/_workspace/src/google.golang.org/cloud/logging/logging.go b/vendor/google.golang.org/cloud/logging/logging.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/logging/logging.go rename to vendor/google.golang.org/cloud/logging/logging.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/logging/logging_test.go b/vendor/google.golang.org/cloud/logging/logging_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/logging/logging_test.go rename to vendor/google.golang.org/cloud/logging/logging_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/option.go b/vendor/google.golang.org/cloud/option.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/option.go rename to vendor/google.golang.org/cloud/option.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/pubsub/example_test.go b/vendor/google.golang.org/cloud/pubsub/example_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/pubsub/example_test.go rename to vendor/google.golang.org/cloud/pubsub/example_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/pubsub/integration_test.go b/vendor/google.golang.org/cloud/pubsub/integration_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/pubsub/integration_test.go rename to vendor/google.golang.org/cloud/pubsub/integration_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/pubsub/pubsub.go b/vendor/google.golang.org/cloud/pubsub/pubsub.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/pubsub/pubsub.go rename to vendor/google.golang.org/cloud/pubsub/pubsub.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/pubsub/pubsub_test.go b/vendor/google.golang.org/cloud/pubsub/pubsub_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/pubsub/pubsub_test.go rename to vendor/google.golang.org/cloud/pubsub/pubsub_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/storage/acl.go b/vendor/google.golang.org/cloud/storage/acl.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/storage/acl.go rename to vendor/google.golang.org/cloud/storage/acl.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/storage/example_test.go b/vendor/google.golang.org/cloud/storage/example_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/storage/example_test.go rename to vendor/google.golang.org/cloud/storage/example_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/storage/integration_test.go b/vendor/google.golang.org/cloud/storage/integration_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/storage/integration_test.go rename to vendor/google.golang.org/cloud/storage/integration_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/storage/storage.go b/vendor/google.golang.org/cloud/storage/storage.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/storage/storage.go rename to vendor/google.golang.org/cloud/storage/storage.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/storage/storage_test.go b/vendor/google.golang.org/cloud/storage/storage_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/storage/storage_test.go rename to vendor/google.golang.org/cloud/storage/storage_test.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/storage/testdata/dummy_pem b/vendor/google.golang.org/cloud/storage/testdata/dummy_pem similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/storage/testdata/dummy_pem rename to vendor/google.golang.org/cloud/storage/testdata/dummy_pem diff --git a/Godeps/_workspace/src/google.golang.org/cloud/storage/testdata/dummy_rsa b/vendor/google.golang.org/cloud/storage/testdata/dummy_rsa similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/storage/testdata/dummy_rsa rename to vendor/google.golang.org/cloud/storage/testdata/dummy_rsa diff --git a/Godeps/_workspace/src/google.golang.org/cloud/storage/types.go b/vendor/google.golang.org/cloud/storage/types.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/storage/types.go rename to vendor/google.golang.org/cloud/storage/types.go diff --git a/Godeps/_workspace/src/google.golang.org/cloud/storage/types_test.go b/vendor/google.golang.org/cloud/storage/types_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/cloud/storage/types_test.go rename to vendor/google.golang.org/cloud/storage/types_test.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/.travis.yml b/vendor/google.golang.org/grpc/.travis.yml similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/.travis.yml rename to vendor/google.golang.org/grpc/.travis.yml diff --git a/Godeps/_workspace/src/google.golang.org/grpc/CONTRIBUTING.md b/vendor/google.golang.org/grpc/CONTRIBUTING.md similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/CONTRIBUTING.md rename to vendor/google.golang.org/grpc/CONTRIBUTING.md diff --git a/Godeps/_workspace/src/google.golang.org/grpc/LICENSE b/vendor/google.golang.org/grpc/LICENSE similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/LICENSE rename to vendor/google.golang.org/grpc/LICENSE diff --git a/Godeps/_workspace/src/google.golang.org/grpc/Makefile b/vendor/google.golang.org/grpc/Makefile similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/Makefile rename to vendor/google.golang.org/grpc/Makefile diff --git a/Godeps/_workspace/src/google.golang.org/grpc/PATENTS b/vendor/google.golang.org/grpc/PATENTS similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/PATENTS rename to vendor/google.golang.org/grpc/PATENTS diff --git a/Godeps/_workspace/src/google.golang.org/grpc/README.md b/vendor/google.golang.org/grpc/README.md similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/README.md rename to vendor/google.golang.org/grpc/README.md diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/benchmark.go b/vendor/google.golang.org/grpc/benchmark/benchmark.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/benchmark.go rename to vendor/google.golang.org/grpc/benchmark/benchmark.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/benchmark_test.go b/vendor/google.golang.org/grpc/benchmark/benchmark_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/benchmark_test.go rename to vendor/google.golang.org/grpc/benchmark/benchmark_test.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/client/main.go b/vendor/google.golang.org/grpc/benchmark/client/main.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/client/main.go rename to vendor/google.golang.org/grpc/benchmark/client/main.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.pb.go b/vendor/google.golang.org/grpc/benchmark/grpc_testing/test.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.pb.go rename to vendor/google.golang.org/grpc/benchmark/grpc_testing/test.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.proto b/vendor/google.golang.org/grpc/benchmark/grpc_testing/test.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.proto rename to vendor/google.golang.org/grpc/benchmark/grpc_testing/test.proto diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/server/main.go b/vendor/google.golang.org/grpc/benchmark/server/main.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/server/main.go rename to vendor/google.golang.org/grpc/benchmark/server/main.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/counter.go b/vendor/google.golang.org/grpc/benchmark/stats/counter.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/counter.go rename to vendor/google.golang.org/grpc/benchmark/stats/counter.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/histogram.go b/vendor/google.golang.org/grpc/benchmark/stats/histogram.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/histogram.go rename to vendor/google.golang.org/grpc/benchmark/stats/histogram.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/stats.go b/vendor/google.golang.org/grpc/benchmark/stats/stats.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/stats.go rename to vendor/google.golang.org/grpc/benchmark/stats/stats.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/timeseries.go b/vendor/google.golang.org/grpc/benchmark/stats/timeseries.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/timeseries.go rename to vendor/google.golang.org/grpc/benchmark/stats/timeseries.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/tracker.go b/vendor/google.golang.org/grpc/benchmark/stats/tracker.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/tracker.go rename to vendor/google.golang.org/grpc/benchmark/stats/tracker.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/util.go b/vendor/google.golang.org/grpc/benchmark/stats/util.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/util.go rename to vendor/google.golang.org/grpc/benchmark/stats/util.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/call.go b/vendor/google.golang.org/grpc/call.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/call.go rename to vendor/google.golang.org/grpc/call.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/clientconn.go b/vendor/google.golang.org/grpc/clientconn.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/clientconn.go rename to vendor/google.golang.org/grpc/clientconn.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/codegen.sh b/vendor/google.golang.org/grpc/codegen.sh similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/codegen.sh rename to vendor/google.golang.org/grpc/codegen.sh diff --git a/Godeps/_workspace/src/google.golang.org/grpc/codes/code_string.go b/vendor/google.golang.org/grpc/codes/code_string.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/codes/code_string.go rename to vendor/google.golang.org/grpc/codes/code_string.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/codes/codes.go b/vendor/google.golang.org/grpc/codes/codes.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/codes/codes.go rename to vendor/google.golang.org/grpc/codes/codes.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/credentials/credentials.go b/vendor/google.golang.org/grpc/credentials/credentials.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/credentials/credentials.go rename to vendor/google.golang.org/grpc/credentials/credentials.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/doc.go b/vendor/google.golang.org/grpc/doc.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/doc.go rename to vendor/google.golang.org/grpc/doc.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/README.md b/vendor/google.golang.org/grpc/examples/route_guide/README.md similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/README.md rename to vendor/google.golang.org/grpc/examples/route_guide/README.md diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/client/client.go b/vendor/google.golang.org/grpc/examples/route_guide/client/client.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/client/client.go rename to vendor/google.golang.org/grpc/examples/route_guide/client/client.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/proto/route_guide.pb.go b/vendor/google.golang.org/grpc/examples/route_guide/proto/route_guide.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/proto/route_guide.pb.go rename to vendor/google.golang.org/grpc/examples/route_guide/proto/route_guide.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/proto/route_guide.proto b/vendor/google.golang.org/grpc/examples/route_guide/proto/route_guide.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/proto/route_guide.proto rename to vendor/google.golang.org/grpc/examples/route_guide/proto/route_guide.proto diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/server/server.go b/vendor/google.golang.org/grpc/examples/route_guide/server/server.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/server/server.go rename to vendor/google.golang.org/grpc/examples/route_guide/server/server.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/testdata/route_guide_db.json b/vendor/google.golang.org/grpc/examples/route_guide/testdata/route_guide_db.json similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/testdata/route_guide_db.json rename to vendor/google.golang.org/grpc/examples/route_guide/testdata/route_guide_db.json diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/testdata/server1.key b/vendor/google.golang.org/grpc/examples/route_guide/testdata/server1.key similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/testdata/server1.key rename to vendor/google.golang.org/grpc/examples/route_guide/testdata/server1.key diff --git a/Godeps/_workspace/src/google.golang.org/grpc/grpc-auth-support.md b/vendor/google.golang.org/grpc/grpc-auth-support.md similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/grpc-auth-support.md rename to vendor/google.golang.org/grpc/grpc-auth-support.md diff --git a/Godeps/_workspace/src/google.golang.org/grpc/grpclog/glogger/glogger.go b/vendor/google.golang.org/grpc/grpclog/glogger/glogger.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/grpclog/glogger/glogger.go rename to vendor/google.golang.org/grpc/grpclog/glogger/glogger.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/grpclog/logger.go b/vendor/google.golang.org/grpc/grpclog/logger.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/grpclog/logger.go rename to vendor/google.golang.org/grpc/grpclog/logger.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health/health.pb.go b/vendor/google.golang.org/grpc/health/grpc_health/health.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health/health.pb.go rename to vendor/google.golang.org/grpc/health/grpc_health/health.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health/health.proto b/vendor/google.golang.org/grpc/health/grpc_health/health.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health/health.proto rename to vendor/google.golang.org/grpc/health/grpc_health/health.proto diff --git a/Godeps/_workspace/src/google.golang.org/grpc/health/health.go b/vendor/google.golang.org/grpc/health/health.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/health/health.go rename to vendor/google.golang.org/grpc/health/health.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/client/client.go b/vendor/google.golang.org/grpc/interop/client/client.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/interop/client/client.go rename to vendor/google.golang.org/grpc/interop/client/client.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/client/testdata/server1.key b/vendor/google.golang.org/grpc/interop/client/testdata/server1.key similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/interop/client/testdata/server1.key rename to vendor/google.golang.org/grpc/interop/client/testdata/server1.key diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.pb.go b/vendor/google.golang.org/grpc/interop/grpc_testing/test.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.pb.go rename to vendor/google.golang.org/grpc/interop/grpc_testing/test.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.proto b/vendor/google.golang.org/grpc/interop/grpc_testing/test.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.proto rename to vendor/google.golang.org/grpc/interop/grpc_testing/test.proto diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/server/server.go b/vendor/google.golang.org/grpc/interop/server/server.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/interop/server/server.go rename to vendor/google.golang.org/grpc/interop/server/server.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/server/testdata/server1.key b/vendor/google.golang.org/grpc/interop/server/testdata/server1.key similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/interop/server/testdata/server1.key rename to vendor/google.golang.org/grpc/interop/server/testdata/server1.key diff --git a/Godeps/_workspace/src/google.golang.org/grpc/metadata/metadata.go b/vendor/google.golang.org/grpc/metadata/metadata.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/metadata/metadata.go rename to vendor/google.golang.org/grpc/metadata/metadata.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/metadata/metadata_test.go b/vendor/google.golang.org/grpc/metadata/metadata_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/metadata/metadata_test.go rename to vendor/google.golang.org/grpc/metadata/metadata_test.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/rpc_util.go b/vendor/google.golang.org/grpc/rpc_util.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/rpc_util.go rename to vendor/google.golang.org/grpc/rpc_util.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/rpc_util_test.go b/vendor/google.golang.org/grpc/rpc_util_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/rpc_util_test.go rename to vendor/google.golang.org/grpc/rpc_util_test.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/server.go b/vendor/google.golang.org/grpc/server.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/server.go rename to vendor/google.golang.org/grpc/server.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/stream.go b/vendor/google.golang.org/grpc/stream.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/stream.go rename to vendor/google.golang.org/grpc/stream.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.pb.go b/vendor/google.golang.org/grpc/test/codec_perf/perf.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.pb.go rename to vendor/google.golang.org/grpc/test/codec_perf/perf.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.proto b/vendor/google.golang.org/grpc/test/codec_perf/perf.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.proto rename to vendor/google.golang.org/grpc/test/codec_perf/perf.proto diff --git a/Godeps/_workspace/src/google.golang.org/grpc/test/end2end_test.go b/vendor/google.golang.org/grpc/test/end2end_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/test/end2end_test.go rename to vendor/google.golang.org/grpc/test/end2end_test.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.pb.go b/vendor/google.golang.org/grpc/test/grpc_testing/test.pb.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.pb.go rename to vendor/google.golang.org/grpc/test/grpc_testing/test.pb.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.proto b/vendor/google.golang.org/grpc/test/grpc_testing/test.proto similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.proto rename to vendor/google.golang.org/grpc/test/grpc_testing/test.proto diff --git a/Godeps/_workspace/src/google.golang.org/grpc/test/testdata/server1.key b/vendor/google.golang.org/grpc/test/testdata/server1.key similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/test/testdata/server1.key rename to vendor/google.golang.org/grpc/test/testdata/server1.key diff --git a/Godeps/_workspace/src/google.golang.org/grpc/trace.go b/vendor/google.golang.org/grpc/trace.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/trace.go rename to vendor/google.golang.org/grpc/trace.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/control.go b/vendor/google.golang.org/grpc/transport/control.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/transport/control.go rename to vendor/google.golang.org/grpc/transport/control.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/http2_client.go b/vendor/google.golang.org/grpc/transport/http2_client.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/transport/http2_client.go rename to vendor/google.golang.org/grpc/transport/http2_client.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/http2_server.go b/vendor/google.golang.org/grpc/transport/http2_server.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/transport/http2_server.go rename to vendor/google.golang.org/grpc/transport/http2_server.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/http_util.go b/vendor/google.golang.org/grpc/transport/http_util.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/transport/http_util.go rename to vendor/google.golang.org/grpc/transport/http_util.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/http_util_test.go b/vendor/google.golang.org/grpc/transport/http_util_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/transport/http_util_test.go rename to vendor/google.golang.org/grpc/transport/http_util_test.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/testdata/server1.key b/vendor/google.golang.org/grpc/transport/testdata/server1.key similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/transport/testdata/server1.key rename to vendor/google.golang.org/grpc/transport/testdata/server1.key diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/transport.go b/vendor/google.golang.org/grpc/transport/transport.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/transport/transport.go rename to vendor/google.golang.org/grpc/transport/transport.go diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/transport_test.go b/vendor/google.golang.org/grpc/transport/transport_test.go similarity index 100% rename from Godeps/_workspace/src/google.golang.org/grpc/transport/transport_test.go rename to vendor/google.golang.org/grpc/transport/transport_test.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/.gitignore b/vendor/gopkg.in/check.v1/.gitignore similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/.gitignore rename to vendor/gopkg.in/check.v1/.gitignore diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/LICENSE b/vendor/gopkg.in/check.v1/LICENSE similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/LICENSE rename to vendor/gopkg.in/check.v1/LICENSE diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/README.md b/vendor/gopkg.in/check.v1/README.md similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/README.md rename to vendor/gopkg.in/check.v1/README.md diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/TODO b/vendor/gopkg.in/check.v1/TODO similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/TODO rename to vendor/gopkg.in/check.v1/TODO diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/benchmark.go b/vendor/gopkg.in/check.v1/benchmark.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/benchmark.go rename to vendor/gopkg.in/check.v1/benchmark.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/benchmark_test.go b/vendor/gopkg.in/check.v1/benchmark_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/benchmark_test.go rename to vendor/gopkg.in/check.v1/benchmark_test.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/bootstrap_test.go b/vendor/gopkg.in/check.v1/bootstrap_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/bootstrap_test.go rename to vendor/gopkg.in/check.v1/bootstrap_test.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/check.go b/vendor/gopkg.in/check.v1/check.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/check.go rename to vendor/gopkg.in/check.v1/check.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/check_test.go b/vendor/gopkg.in/check.v1/check_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/check_test.go rename to vendor/gopkg.in/check.v1/check_test.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/checkers.go b/vendor/gopkg.in/check.v1/checkers.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/checkers.go rename to vendor/gopkg.in/check.v1/checkers.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/checkers_test.go b/vendor/gopkg.in/check.v1/checkers_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/checkers_test.go rename to vendor/gopkg.in/check.v1/checkers_test.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/export_test.go b/vendor/gopkg.in/check.v1/export_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/export_test.go rename to vendor/gopkg.in/check.v1/export_test.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/fixture_test.go b/vendor/gopkg.in/check.v1/fixture_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/fixture_test.go rename to vendor/gopkg.in/check.v1/fixture_test.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/foundation_test.go b/vendor/gopkg.in/check.v1/foundation_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/foundation_test.go rename to vendor/gopkg.in/check.v1/foundation_test.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/helpers.go b/vendor/gopkg.in/check.v1/helpers.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/helpers.go rename to vendor/gopkg.in/check.v1/helpers.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/helpers_test.go b/vendor/gopkg.in/check.v1/helpers_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/helpers_test.go rename to vendor/gopkg.in/check.v1/helpers_test.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/printer.go b/vendor/gopkg.in/check.v1/printer.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/printer.go rename to vendor/gopkg.in/check.v1/printer.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/printer_test.go b/vendor/gopkg.in/check.v1/printer_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/printer_test.go rename to vendor/gopkg.in/check.v1/printer_test.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/run.go b/vendor/gopkg.in/check.v1/run.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/run.go rename to vendor/gopkg.in/check.v1/run.go diff --git a/Godeps/_workspace/src/gopkg.in/check.v1/run_test.go b/vendor/gopkg.in/check.v1/run_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/run_test.go rename to vendor/gopkg.in/check.v1/run_test.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE b/vendor/gopkg.in/yaml.v2/LICENSE similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE rename to vendor/gopkg.in/yaml.v2/LICENSE diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE.libyaml b/vendor/gopkg.in/yaml.v2/LICENSE.libyaml similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE.libyaml rename to vendor/gopkg.in/yaml.v2/LICENSE.libyaml diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/README.md b/vendor/gopkg.in/yaml.v2/README.md similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/README.md rename to vendor/gopkg.in/yaml.v2/README.md diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/apic.go b/vendor/gopkg.in/yaml.v2/apic.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/apic.go rename to vendor/gopkg.in/yaml.v2/apic.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/decode.go b/vendor/gopkg.in/yaml.v2/decode.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/decode.go rename to vendor/gopkg.in/yaml.v2/decode.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/decode_test.go b/vendor/gopkg.in/yaml.v2/decode_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/decode_test.go rename to vendor/gopkg.in/yaml.v2/decode_test.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/emitterc.go b/vendor/gopkg.in/yaml.v2/emitterc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/emitterc.go rename to vendor/gopkg.in/yaml.v2/emitterc.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/encode.go b/vendor/gopkg.in/yaml.v2/encode.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/encode.go rename to vendor/gopkg.in/yaml.v2/encode.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/encode_test.go b/vendor/gopkg.in/yaml.v2/encode_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/encode_test.go rename to vendor/gopkg.in/yaml.v2/encode_test.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/parserc.go b/vendor/gopkg.in/yaml.v2/parserc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/parserc.go rename to vendor/gopkg.in/yaml.v2/parserc.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/readerc.go b/vendor/gopkg.in/yaml.v2/readerc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/readerc.go rename to vendor/gopkg.in/yaml.v2/readerc.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/resolve.go b/vendor/gopkg.in/yaml.v2/resolve.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/resolve.go rename to vendor/gopkg.in/yaml.v2/resolve.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/scannerc.go b/vendor/gopkg.in/yaml.v2/scannerc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/scannerc.go rename to vendor/gopkg.in/yaml.v2/scannerc.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/sorter.go b/vendor/gopkg.in/yaml.v2/sorter.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/sorter.go rename to vendor/gopkg.in/yaml.v2/sorter.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/suite_test.go b/vendor/gopkg.in/yaml.v2/suite_test.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/suite_test.go rename to vendor/gopkg.in/yaml.v2/suite_test.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/writerc.go b/vendor/gopkg.in/yaml.v2/writerc.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/writerc.go rename to vendor/gopkg.in/yaml.v2/writerc.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/yaml.go b/vendor/gopkg.in/yaml.v2/yaml.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/yaml.go rename to vendor/gopkg.in/yaml.v2/yaml.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/yamlh.go b/vendor/gopkg.in/yaml.v2/yamlh.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/yamlh.go rename to vendor/gopkg.in/yaml.v2/yamlh.go diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/yamlprivateh.go b/vendor/gopkg.in/yaml.v2/yamlprivateh.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/yaml.v2/yamlprivateh.go rename to vendor/gopkg.in/yaml.v2/yamlprivateh.go