diff --git a/.travis.yml b/.travis.yml index c1d545c548da..e037182f86d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ language: go go: - - 1.4.2 + - 1.6.2 install: # - go get code.google.com/p/go.tools/cmd/goimports # - go get github.com/golang/lint/golint - # - go get golang.org/x/tools/cmd/vet + # - go get golang.org/x/tools/cmd/vet - go get golang.org/x/tools/cmd/cover before_script: # - gofmt -l -w . @@ -24,6 +24,6 @@ notifications: webhooks: urls: - https://webhooks.gitter.im/e/e09ccdce1048c5e03445 - on_success: change + on_success: change on_failure: always - on_start: false + on_start: false diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index f2694a05cdc2..33ac3b1a7bba 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "github.com/ethereum/go-ethereum", - "GoVersion": "go1.5.2", + "GoVersion": "go1.6.2", "Packages": [ "./..." ], diff --git a/Godeps/Readme b/Godeps/Readme deleted file mode 100644 index 4cdaa53d56d7..000000000000 --- a/Godeps/Readme +++ /dev/null @@ -1,5 +0,0 @@ -This directory tree is generated automatically by godep. - -Please do not edit. - -See https://github.com/tools/godep for more information. diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore deleted file mode 100644 index f037d684ef2b..000000000000 --- a/Godeps/_workspace/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/pkg -/bin diff --git a/Makefile b/Makefile index 2b553299f6f5..ac0ae312e845 100644 --- a/Makefile +++ b/Makefile @@ -103,13 +103,13 @@ evm: @echo "Run \"$(GOBIN)/evm to start the evm." all: - build/env.sh go install -v $(shell build/flags.sh) ./... + build/env.sh go install -v $(shell build/flags.sh) `build/env.sh go list ./... | grep -v /vendor/` test: all - build/env.sh go test ./... + build/env.sh go test `build/env.sh go list ./... | grep -v /vendor/` travis-test-with-coverage: all - build/env.sh go vet ./... + build/env.sh go vet `build/env.sh go list ./... | grep -v /vendor/` build/env.sh build/test-global-coverage.sh xgo: diff --git a/build/env.sh b/build/env.sh index 04401a3e176a..07bdd7d43cfd 100755 --- a/build/env.sh +++ b/build/env.sh @@ -20,9 +20,11 @@ fi # Set up the environment to use the workspace. # Also add Godeps workspace so we build using canned dependencies. -GOPATH="$ethdir/go-ethereum/Godeps/_workspace:$workspace" +GOPATH="$workspace" GOBIN="$PWD/build/bin" -export GOPATH GOBIN +GO15VENDOREXPERIMENT=1 + +export GOPATH GOBIN GO15VENDOREXPERIMENT # Run the command inside the workspace. cd "$ethdir/go-ethereum" diff --git a/build/test-global-coverage.sh b/build/test-global-coverage.sh index a51b6a9e57af..c1de12ce0e05 100755 --- a/build/test-global-coverage.sh +++ b/build/test-global-coverage.sh @@ -3,7 +3,7 @@ set -e echo "" > coverage.txt -for d in $(find ./* -maxdepth 10 -type d -not -path "./build" -not -path "./Godeps/*" ); do +for d in $(find ./* -maxdepth 10 -type d -not -path "./build" -not -path "./vendor/*" ); do if ls $d/*.go &> /dev/null; then go test -coverprofile=profile.out -covermode=atomic $d if [ -f profile.out ]; then diff --git a/node/node.go b/node/node.go index 06a1b7aed76d..7ac47ceb39c4 100644 --- a/node/node.go +++ b/node/node.go @@ -152,7 +152,7 @@ func (n *Node) Start() error { } // Otherwise copy and specialize the P2P configuration running := new(p2p.Server) - *running = *n.serverConfig + reflect.ValueOf(running).Elem().Set(reflect.ValueOf(n.serverConfig).Elem()) // Fancy *running = *n.serverConfig to prevent mutex copy services := make(map[reflect.Type]Service) for _, constructor := range n.serviceFuncs { diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/cl.go b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/cl.go similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/cl.go rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/cl.go diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/context.go b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/context.go similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/context.go rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/context.go diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/device.go b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/device.go similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/device.go rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/device.go diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/device12.go b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/device12.go similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/device12.go rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/device12.go diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl.h b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl.h similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl.h rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl.h diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_ext.h b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_ext.h similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_ext.h rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_ext.h diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_gl.h b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_gl.h similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_gl.h rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_gl.h diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_gl_ext.h b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_gl_ext.h similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_gl_ext.h rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_gl_ext.h diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_platform.h b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_platform.h similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_platform.h rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/cl_platform.h diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/opencl.h b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/opencl.h similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/opencl.h rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/headers/1.2/opencl.h diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/image.go b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/image.go similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/image.go rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/image.go diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/kernel.go b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/kernel.go similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/kernel.go rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/kernel.go diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/kernel10.go b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/kernel10.go similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/kernel10.go rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/kernel10.go diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/kernel12.go b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/kernel12.go similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/kernel12.go rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/kernel12.go diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/platform.go b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/platform.go similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/platform.go rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/platform.go diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/program.go b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/program.go similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/program.go rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/program.go diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/queue.go b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/queue.go similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/queue.go rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/queue.go diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/types.go b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/types.go similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/types.go rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/types.go diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/types12.go b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/types12.go similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/types12.go rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/types12.go diff --git a/Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/types_darwin.go b/vendor/github.com/Gustav-Simonsson/go-opencl/cl/types_darwin.go similarity index 100% rename from Godeps/_workspace/src/github.com/Gustav-Simonsson/go-opencl/cl/types_darwin.go rename to vendor/github.com/Gustav-Simonsson/go-opencl/cl/types_darwin.go diff --git a/Godeps/_workspace/src/github.com/cespare/cp/LICENSE.txt b/vendor/github.com/cespare/cp/LICENSE.txt similarity index 100% rename from Godeps/_workspace/src/github.com/cespare/cp/LICENSE.txt rename to vendor/github.com/cespare/cp/LICENSE.txt diff --git a/Godeps/_workspace/src/github.com/cespare/cp/README.md b/vendor/github.com/cespare/cp/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/cespare/cp/README.md rename to vendor/github.com/cespare/cp/README.md diff --git a/Godeps/_workspace/src/github.com/cespare/cp/cp.go b/vendor/github.com/cespare/cp/cp.go similarity index 100% rename from Godeps/_workspace/src/github.com/cespare/cp/cp.go rename to vendor/github.com/cespare/cp/cp.go diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/.travis.yml b/vendor/github.com/codegangsta/cli/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/codegangsta/cli/.travis.yml rename to vendor/github.com/codegangsta/cli/.travis.yml diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/LICENSE b/vendor/github.com/codegangsta/cli/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/codegangsta/cli/LICENSE rename to vendor/github.com/codegangsta/cli/LICENSE diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/README.md b/vendor/github.com/codegangsta/cli/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/codegangsta/cli/README.md rename to vendor/github.com/codegangsta/cli/README.md diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/app.go b/vendor/github.com/codegangsta/cli/app.go similarity index 100% rename from Godeps/_workspace/src/github.com/codegangsta/cli/app.go rename to vendor/github.com/codegangsta/cli/app.go diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/appveyor.yml b/vendor/github.com/codegangsta/cli/appveyor.yml similarity index 100% rename from Godeps/_workspace/src/github.com/codegangsta/cli/appveyor.yml rename to vendor/github.com/codegangsta/cli/appveyor.yml diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/autocomplete/bash_autocomplete b/vendor/github.com/codegangsta/cli/autocomplete/bash_autocomplete similarity index 100% rename from Godeps/_workspace/src/github.com/codegangsta/cli/autocomplete/bash_autocomplete rename to vendor/github.com/codegangsta/cli/autocomplete/bash_autocomplete diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/autocomplete/zsh_autocomplete b/vendor/github.com/codegangsta/cli/autocomplete/zsh_autocomplete similarity index 100% rename from Godeps/_workspace/src/github.com/codegangsta/cli/autocomplete/zsh_autocomplete rename to vendor/github.com/codegangsta/cli/autocomplete/zsh_autocomplete diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/cli.go b/vendor/github.com/codegangsta/cli/cli.go similarity index 100% rename from Godeps/_workspace/src/github.com/codegangsta/cli/cli.go rename to vendor/github.com/codegangsta/cli/cli.go diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/command.go b/vendor/github.com/codegangsta/cli/command.go similarity index 100% rename from Godeps/_workspace/src/github.com/codegangsta/cli/command.go rename to vendor/github.com/codegangsta/cli/command.go diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/context.go b/vendor/github.com/codegangsta/cli/context.go similarity index 100% rename from Godeps/_workspace/src/github.com/codegangsta/cli/context.go rename to vendor/github.com/codegangsta/cli/context.go diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/flag.go b/vendor/github.com/codegangsta/cli/flag.go similarity index 100% rename from Godeps/_workspace/src/github.com/codegangsta/cli/flag.go rename to vendor/github.com/codegangsta/cli/flag.go diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/help.go b/vendor/github.com/codegangsta/cli/help.go similarity index 100% rename from Godeps/_workspace/src/github.com/codegangsta/cli/help.go rename to vendor/github.com/codegangsta/cli/help.go diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/LICENSE b/vendor/github.com/davecgh/go-spew/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/davecgh/go-spew/LICENSE rename to vendor/github.com/davecgh/go-spew/LICENSE diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/bypass.go b/vendor/github.com/davecgh/go-spew/spew/bypass.go similarity index 100% rename from Godeps/_workspace/src/github.com/davecgh/go-spew/spew/bypass.go rename to vendor/github.com/davecgh/go-spew/spew/bypass.go diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/bypasssafe.go b/vendor/github.com/davecgh/go-spew/spew/bypasssafe.go similarity index 100% rename from Godeps/_workspace/src/github.com/davecgh/go-spew/spew/bypasssafe.go rename to vendor/github.com/davecgh/go-spew/spew/bypasssafe.go diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/common.go b/vendor/github.com/davecgh/go-spew/spew/common.go similarity index 100% rename from Godeps/_workspace/src/github.com/davecgh/go-spew/spew/common.go rename to vendor/github.com/davecgh/go-spew/spew/common.go diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/config.go b/vendor/github.com/davecgh/go-spew/spew/config.go similarity index 100% rename from Godeps/_workspace/src/github.com/davecgh/go-spew/spew/config.go rename to vendor/github.com/davecgh/go-spew/spew/config.go diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/doc.go b/vendor/github.com/davecgh/go-spew/spew/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/davecgh/go-spew/spew/doc.go rename to vendor/github.com/davecgh/go-spew/spew/doc.go diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/dump.go b/vendor/github.com/davecgh/go-spew/spew/dump.go similarity index 100% rename from Godeps/_workspace/src/github.com/davecgh/go-spew/spew/dump.go rename to vendor/github.com/davecgh/go-spew/spew/dump.go diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/format.go b/vendor/github.com/davecgh/go-spew/spew/format.go similarity index 100% rename from Godeps/_workspace/src/github.com/davecgh/go-spew/spew/format.go rename to vendor/github.com/davecgh/go-spew/spew/format.go diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/spew.go b/vendor/github.com/davecgh/go-spew/spew/spew.go similarity index 100% rename from Godeps/_workspace/src/github.com/davecgh/go-spew/spew/spew.go rename to vendor/github.com/davecgh/go-spew/spew/spew.go diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/.gitignore b/vendor/github.com/ethereum/ethash/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/.gitignore rename to vendor/github.com/ethereum/ethash/.gitignore diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/.travis.yml b/vendor/github.com/ethereum/ethash/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/.travis.yml rename to vendor/github.com/ethereum/ethash/.travis.yml diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/CMakeLists.txt b/vendor/github.com/ethereum/ethash/CMakeLists.txt similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/CMakeLists.txt rename to vendor/github.com/ethereum/ethash/CMakeLists.txt diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/MANIFEST.in b/vendor/github.com/ethereum/ethash/MANIFEST.in similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/MANIFEST.in rename to vendor/github.com/ethereum/ethash/MANIFEST.in diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/Makefile b/vendor/github.com/ethereum/ethash/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/Makefile rename to vendor/github.com/ethereum/ethash/Makefile diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/README.md b/vendor/github.com/ethereum/ethash/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/README.md rename to vendor/github.com/ethereum/ethash/README.md diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/Vagrantfile b/vendor/github.com/ethereum/ethash/Vagrantfile similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/Vagrantfile rename to vendor/github.com/ethereum/ethash/Vagrantfile diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/appveyor.yml b/vendor/github.com/ethereum/ethash/appveyor.yml similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/appveyor.yml rename to vendor/github.com/ethereum/ethash/appveyor.yml diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go b/vendor/github.com/ethereum/ethash/ethash.go similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go rename to vendor/github.com/ethereum/ethash/ethash.go diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/ethash_opencl.go b/vendor/github.com/ethereum/ethash/ethash_opencl.go similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/ethash_opencl.go rename to vendor/github.com/ethereum/ethash/ethash_opencl.go diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/ethash_opencl_kernel_go_str.go b/vendor/github.com/ethereum/ethash/ethash_opencl_kernel_go_str.go similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/ethash_opencl_kernel_go_str.go rename to vendor/github.com/ethereum/ethash/ethash_opencl_kernel_go_str.go diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/ethashc.go b/vendor/github.com/ethereum/ethash/ethashc.go similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/ethashc.go rename to vendor/github.com/ethereum/ethash/ethashc.go diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/setup.py b/vendor/github.com/ethereum/ethash/setup.py similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/setup.py rename to vendor/github.com/ethereum/ethash/setup.py diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/CMakeLists.txt b/vendor/github.com/ethereum/ethash/src/libethash/CMakeLists.txt similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/CMakeLists.txt rename to vendor/github.com/ethereum/ethash/src/libethash/CMakeLists.txt diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/compiler.h b/vendor/github.com/ethereum/ethash/src/libethash/compiler.h similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/compiler.h rename to vendor/github.com/ethereum/ethash/src/libethash/compiler.h diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/data_sizes.h b/vendor/github.com/ethereum/ethash/src/libethash/data_sizes.h similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/data_sizes.h rename to vendor/github.com/ethereum/ethash/src/libethash/data_sizes.h diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/endian.h b/vendor/github.com/ethereum/ethash/src/libethash/endian.h similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/endian.h rename to vendor/github.com/ethereum/ethash/src/libethash/endian.h diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/ethash.h b/vendor/github.com/ethereum/ethash/src/libethash/ethash.h similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/ethash.h rename to vendor/github.com/ethereum/ethash/src/libethash/ethash.h diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/fnv.h b/vendor/github.com/ethereum/ethash/src/libethash/fnv.h similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/fnv.h rename to vendor/github.com/ethereum/ethash/src/libethash/fnv.h diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/internal.c b/vendor/github.com/ethereum/ethash/src/libethash/internal.c similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/internal.c rename to vendor/github.com/ethereum/ethash/src/libethash/internal.c diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/internal.h b/vendor/github.com/ethereum/ethash/src/libethash/internal.h similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/internal.h rename to vendor/github.com/ethereum/ethash/src/libethash/internal.h diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/io.c b/vendor/github.com/ethereum/ethash/src/libethash/io.c similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/io.c rename to vendor/github.com/ethereum/ethash/src/libethash/io.c diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/io.h b/vendor/github.com/ethereum/ethash/src/libethash/io.h similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/io.h rename to vendor/github.com/ethereum/ethash/src/libethash/io.h diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/io_posix.c b/vendor/github.com/ethereum/ethash/src/libethash/io_posix.c similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/io_posix.c rename to vendor/github.com/ethereum/ethash/src/libethash/io_posix.c diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/io_win32.c b/vendor/github.com/ethereum/ethash/src/libethash/io_win32.c similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/io_win32.c rename to vendor/github.com/ethereum/ethash/src/libethash/io_win32.c diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/mmap.h b/vendor/github.com/ethereum/ethash/src/libethash/mmap.h similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/mmap.h rename to vendor/github.com/ethereum/ethash/src/libethash/mmap.h diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/mmap_win32.c b/vendor/github.com/ethereum/ethash/src/libethash/mmap_win32.c similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/mmap_win32.c rename to vendor/github.com/ethereum/ethash/src/libethash/mmap_win32.c diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/sha3.c b/vendor/github.com/ethereum/ethash/src/libethash/sha3.c similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/sha3.c rename to vendor/github.com/ethereum/ethash/src/libethash/sha3.c diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/sha3.h b/vendor/github.com/ethereum/ethash/src/libethash/sha3.h similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/sha3.h rename to vendor/github.com/ethereum/ethash/src/libethash/sha3.h diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/sha3_cryptopp.cpp b/vendor/github.com/ethereum/ethash/src/libethash/sha3_cryptopp.cpp similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/sha3_cryptopp.cpp rename to vendor/github.com/ethereum/ethash/src/libethash/sha3_cryptopp.cpp diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/sha3_cryptopp.h b/vendor/github.com/ethereum/ethash/src/libethash/sha3_cryptopp.h similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/sha3_cryptopp.h rename to vendor/github.com/ethereum/ethash/src/libethash/sha3_cryptopp.h diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/util.h b/vendor/github.com/ethereum/ethash/src/libethash/util.h similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/util.h rename to vendor/github.com/ethereum/ethash/src/libethash/util.h diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/util_win32.c b/vendor/github.com/ethereum/ethash/src/libethash/util_win32.c similarity index 100% rename from Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/util_win32.c rename to vendor/github.com/ethereum/ethash/src/libethash/util_win32.c diff --git a/Godeps/_workspace/src/github.com/fatih/color/.travis.yml b/vendor/github.com/fatih/color/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/fatih/color/.travis.yml rename to vendor/github.com/fatih/color/.travis.yml diff --git a/Godeps/_workspace/src/github.com/fatih/color/LICENSE.md b/vendor/github.com/fatih/color/LICENSE.md similarity index 100% rename from Godeps/_workspace/src/github.com/fatih/color/LICENSE.md rename to vendor/github.com/fatih/color/LICENSE.md diff --git a/Godeps/_workspace/src/github.com/fatih/color/README.md b/vendor/github.com/fatih/color/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/fatih/color/README.md rename to vendor/github.com/fatih/color/README.md diff --git a/Godeps/_workspace/src/github.com/fatih/color/color.go b/vendor/github.com/fatih/color/color.go similarity index 100% rename from Godeps/_workspace/src/github.com/fatih/color/color.go rename to vendor/github.com/fatih/color/color.go diff --git a/Godeps/_workspace/src/github.com/fatih/color/doc.go b/vendor/github.com/fatih/color/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/fatih/color/doc.go rename to vendor/github.com/fatih/color/doc.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/.gitignore b/vendor/github.com/gizak/termui/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/.gitignore rename to vendor/github.com/gizak/termui/.gitignore diff --git a/Godeps/_workspace/src/github.com/gizak/termui/.travis.yml b/vendor/github.com/gizak/termui/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/.travis.yml rename to vendor/github.com/gizak/termui/.travis.yml diff --git a/Godeps/_workspace/src/github.com/gizak/termui/LICENSE b/vendor/github.com/gizak/termui/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/LICENSE rename to vendor/github.com/gizak/termui/LICENSE diff --git a/Godeps/_workspace/src/github.com/gizak/termui/README.md b/vendor/github.com/gizak/termui/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/README.md rename to vendor/github.com/gizak/termui/README.md diff --git a/Godeps/_workspace/src/github.com/gizak/termui/barchart.go b/vendor/github.com/gizak/termui/barchart.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/barchart.go rename to vendor/github.com/gizak/termui/barchart.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/block.go b/vendor/github.com/gizak/termui/block.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/block.go rename to vendor/github.com/gizak/termui/block.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/block_common.go b/vendor/github.com/gizak/termui/block_common.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/block_common.go rename to vendor/github.com/gizak/termui/block_common.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/block_windows.go b/vendor/github.com/gizak/termui/block_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/block_windows.go rename to vendor/github.com/gizak/termui/block_windows.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/buffer.go b/vendor/github.com/gizak/termui/buffer.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/buffer.go rename to vendor/github.com/gizak/termui/buffer.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/canvas.go b/vendor/github.com/gizak/termui/canvas.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/canvas.go rename to vendor/github.com/gizak/termui/canvas.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/config b/vendor/github.com/gizak/termui/config similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/config rename to vendor/github.com/gizak/termui/config diff --git a/Godeps/_workspace/src/github.com/gizak/termui/debug/debuger.go b/vendor/github.com/gizak/termui/debug/debuger.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/debug/debuger.go rename to vendor/github.com/gizak/termui/debug/debuger.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/doc.go b/vendor/github.com/gizak/termui/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/doc.go rename to vendor/github.com/gizak/termui/doc.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/events.go b/vendor/github.com/gizak/termui/events.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/events.go rename to vendor/github.com/gizak/termui/events.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/gauge.go b/vendor/github.com/gizak/termui/gauge.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/gauge.go rename to vendor/github.com/gizak/termui/gauge.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/grid.go b/vendor/github.com/gizak/termui/grid.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/grid.go rename to vendor/github.com/gizak/termui/grid.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/helper.go b/vendor/github.com/gizak/termui/helper.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/helper.go rename to vendor/github.com/gizak/termui/helper.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/linechart.go b/vendor/github.com/gizak/termui/linechart.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/linechart.go rename to vendor/github.com/gizak/termui/linechart.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/linechart_others.go b/vendor/github.com/gizak/termui/linechart_others.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/linechart_others.go rename to vendor/github.com/gizak/termui/linechart_others.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/linechart_windows.go b/vendor/github.com/gizak/termui/linechart_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/linechart_windows.go rename to vendor/github.com/gizak/termui/linechart_windows.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/list.go b/vendor/github.com/gizak/termui/list.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/list.go rename to vendor/github.com/gizak/termui/list.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/mbarchart.go b/vendor/github.com/gizak/termui/mbarchart.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/mbarchart.go rename to vendor/github.com/gizak/termui/mbarchart.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/par.go b/vendor/github.com/gizak/termui/par.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/par.go rename to vendor/github.com/gizak/termui/par.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/pos.go b/vendor/github.com/gizak/termui/pos.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/pos.go rename to vendor/github.com/gizak/termui/pos.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/render.go b/vendor/github.com/gizak/termui/render.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/render.go rename to vendor/github.com/gizak/termui/render.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/sparkline.go b/vendor/github.com/gizak/termui/sparkline.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/sparkline.go rename to vendor/github.com/gizak/termui/sparkline.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/test/runtest.go b/vendor/github.com/gizak/termui/test/runtest.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/test/runtest.go rename to vendor/github.com/gizak/termui/test/runtest.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/textbuilder.go b/vendor/github.com/gizak/termui/textbuilder.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/textbuilder.go rename to vendor/github.com/gizak/termui/textbuilder.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/theme.go b/vendor/github.com/gizak/termui/theme.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/theme.go rename to vendor/github.com/gizak/termui/theme.go diff --git a/Godeps/_workspace/src/github.com/gizak/termui/widget.go b/vendor/github.com/gizak/termui/widget.go similarity index 100% rename from Godeps/_workspace/src/github.com/gizak/termui/widget.go rename to vendor/github.com/gizak/termui/widget.go diff --git a/Godeps/_workspace/src/github.com/golang/snappy/AUTHORS b/vendor/github.com/golang/snappy/AUTHORS similarity index 100% rename from Godeps/_workspace/src/github.com/golang/snappy/AUTHORS rename to vendor/github.com/golang/snappy/AUTHORS diff --git a/Godeps/_workspace/src/github.com/golang/snappy/CONTRIBUTORS b/vendor/github.com/golang/snappy/CONTRIBUTORS similarity index 100% rename from Godeps/_workspace/src/github.com/golang/snappy/CONTRIBUTORS rename to vendor/github.com/golang/snappy/CONTRIBUTORS diff --git a/Godeps/_workspace/src/github.com/golang/snappy/LICENSE b/vendor/github.com/golang/snappy/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/golang/snappy/LICENSE rename to vendor/github.com/golang/snappy/LICENSE diff --git a/Godeps/_workspace/src/github.com/golang/snappy/README b/vendor/github.com/golang/snappy/README similarity index 100% rename from Godeps/_workspace/src/github.com/golang/snappy/README rename to vendor/github.com/golang/snappy/README diff --git a/Godeps/_workspace/src/github.com/golang/snappy/decode.go b/vendor/github.com/golang/snappy/decode.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/snappy/decode.go rename to vendor/github.com/golang/snappy/decode.go diff --git a/Godeps/_workspace/src/github.com/golang/snappy/encode.go b/vendor/github.com/golang/snappy/encode.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/snappy/encode.go rename to vendor/github.com/golang/snappy/encode.go diff --git a/Godeps/_workspace/src/github.com/golang/snappy/snappy.go b/vendor/github.com/golang/snappy/snappy.go similarity index 100% rename from Godeps/_workspace/src/github.com/golang/snappy/snappy.go rename to vendor/github.com/golang/snappy/snappy.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/golang-lru/.gitignore b/vendor/github.com/hashicorp/golang-lru/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/golang-lru/.gitignore rename to vendor/github.com/hashicorp/golang-lru/.gitignore diff --git a/Godeps/_workspace/src/github.com/hashicorp/golang-lru/2q.go b/vendor/github.com/hashicorp/golang-lru/2q.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/golang-lru/2q.go rename to vendor/github.com/hashicorp/golang-lru/2q.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/golang-lru/LICENSE b/vendor/github.com/hashicorp/golang-lru/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/golang-lru/LICENSE rename to vendor/github.com/hashicorp/golang-lru/LICENSE diff --git a/Godeps/_workspace/src/github.com/hashicorp/golang-lru/README.md b/vendor/github.com/hashicorp/golang-lru/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/golang-lru/README.md rename to vendor/github.com/hashicorp/golang-lru/README.md diff --git a/Godeps/_workspace/src/github.com/hashicorp/golang-lru/arc.go b/vendor/github.com/hashicorp/golang-lru/arc.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/golang-lru/arc.go rename to vendor/github.com/hashicorp/golang-lru/arc.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/golang-lru/lru.go b/vendor/github.com/hashicorp/golang-lru/lru.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/golang-lru/lru.go rename to vendor/github.com/hashicorp/golang-lru/lru.go diff --git a/Godeps/_workspace/src/github.com/hashicorp/golang-lru/simplelru/lru.go b/vendor/github.com/hashicorp/golang-lru/simplelru/lru.go similarity index 100% rename from Godeps/_workspace/src/github.com/hashicorp/golang-lru/simplelru/lru.go rename to vendor/github.com/hashicorp/golang-lru/simplelru/lru.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/.gitignore b/vendor/github.com/huin/goupnp/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/.gitignore rename to vendor/github.com/huin/goupnp/.gitignore diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/LICENSE b/vendor/github.com/huin/goupnp/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/LICENSE rename to vendor/github.com/huin/goupnp/LICENSE diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/README.md b/vendor/github.com/huin/goupnp/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/README.md rename to vendor/github.com/huin/goupnp/README.md diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/cmd/example_httpu_serving/example_httpu_serving.go b/vendor/github.com/huin/goupnp/cmd/example_httpu_serving/example_httpu_serving.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/cmd/example_httpu_serving/example_httpu_serving.go rename to vendor/github.com/huin/goupnp/cmd/example_httpu_serving/example_httpu_serving.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/cmd/example_internetgateway1/example_internetgateway1.go b/vendor/github.com/huin/goupnp/cmd/example_internetgateway1/example_internetgateway1.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/cmd/example_internetgateway1/example_internetgateway1.go rename to vendor/github.com/huin/goupnp/cmd/example_internetgateway1/example_internetgateway1.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/cmd/example_ssdp_registry/example_ssdp_registry.go b/vendor/github.com/huin/goupnp/cmd/example_ssdp_registry/example_ssdp_registry.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/cmd/example_ssdp_registry/example_ssdp_registry.go rename to vendor/github.com/huin/goupnp/cmd/example_ssdp_registry/example_ssdp_registry.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/dcps/av1/av1.go b/vendor/github.com/huin/goupnp/dcps/av1/av1.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/dcps/av1/av1.go rename to vendor/github.com/huin/goupnp/dcps/av1/av1.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway1/internetgateway1.go b/vendor/github.com/huin/goupnp/dcps/internetgateway1/internetgateway1.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway1/internetgateway1.go rename to vendor/github.com/huin/goupnp/dcps/internetgateway1/internetgateway1.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway2/internetgateway2.go b/vendor/github.com/huin/goupnp/dcps/internetgateway2/internetgateway2.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway2/internetgateway2.go rename to vendor/github.com/huin/goupnp/dcps/internetgateway2/internetgateway2.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/device.go b/vendor/github.com/huin/goupnp/device.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/device.go rename to vendor/github.com/huin/goupnp/device.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/example/example.go b/vendor/github.com/huin/goupnp/example/example.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/example/example.go rename to vendor/github.com/huin/goupnp/example/example.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/gotasks/specgen_task.go b/vendor/github.com/huin/goupnp/gotasks/specgen_task.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/gotasks/specgen_task.go rename to vendor/github.com/huin/goupnp/gotasks/specgen_task.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/goupnp.go b/vendor/github.com/huin/goupnp/goupnp.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/goupnp.go rename to vendor/github.com/huin/goupnp/goupnp.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/httpu/httpu.go b/vendor/github.com/huin/goupnp/httpu/httpu.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/httpu/httpu.go rename to vendor/github.com/huin/goupnp/httpu/httpu.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/httpu/serve.go b/vendor/github.com/huin/goupnp/httpu/serve.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/httpu/serve.go rename to vendor/github.com/huin/goupnp/httpu/serve.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/scpd/scpd.go b/vendor/github.com/huin/goupnp/scpd/scpd.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/scpd/scpd.go rename to vendor/github.com/huin/goupnp/scpd/scpd.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/service_client.go b/vendor/github.com/huin/goupnp/service_client.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/service_client.go rename to vendor/github.com/huin/goupnp/service_client.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/soap/soap.go b/vendor/github.com/huin/goupnp/soap/soap.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/soap/soap.go rename to vendor/github.com/huin/goupnp/soap/soap.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/soap/types.go b/vendor/github.com/huin/goupnp/soap/types.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/soap/types.go rename to vendor/github.com/huin/goupnp/soap/types.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/ssdp/registry.go b/vendor/github.com/huin/goupnp/ssdp/registry.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/ssdp/registry.go rename to vendor/github.com/huin/goupnp/ssdp/registry.go diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/ssdp/ssdp.go b/vendor/github.com/huin/goupnp/ssdp/ssdp.go similarity index 100% rename from Godeps/_workspace/src/github.com/huin/goupnp/ssdp/ssdp.go rename to vendor/github.com/huin/goupnp/ssdp/ssdp.go diff --git a/Godeps/_workspace/src/github.com/jackpal/gateway/LICENSE b/vendor/github.com/jackpal/gateway/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/jackpal/gateway/LICENSE rename to vendor/github.com/jackpal/gateway/LICENSE diff --git a/Godeps/_workspace/src/github.com/jackpal/gateway/README.md b/vendor/github.com/jackpal/gateway/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/jackpal/gateway/README.md rename to vendor/github.com/jackpal/gateway/README.md diff --git a/Godeps/_workspace/src/github.com/jackpal/gateway/gateway_darwin.go b/vendor/github.com/jackpal/gateway/gateway_darwin.go similarity index 100% rename from Godeps/_workspace/src/github.com/jackpal/gateway/gateway_darwin.go rename to vendor/github.com/jackpal/gateway/gateway_darwin.go diff --git a/Godeps/_workspace/src/github.com/jackpal/gateway/gateway_linux.go b/vendor/github.com/jackpal/gateway/gateway_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/jackpal/gateway/gateway_linux.go rename to vendor/github.com/jackpal/gateway/gateway_linux.go diff --git a/Godeps/_workspace/src/github.com/jackpal/gateway/gateway_unimplemented.go b/vendor/github.com/jackpal/gateway/gateway_unimplemented.go similarity index 100% rename from Godeps/_workspace/src/github.com/jackpal/gateway/gateway_unimplemented.go rename to vendor/github.com/jackpal/gateway/gateway_unimplemented.go diff --git a/Godeps/_workspace/src/github.com/jackpal/gateway/gateway_windows.go b/vendor/github.com/jackpal/gateway/gateway_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/jackpal/gateway/gateway_windows.go rename to vendor/github.com/jackpal/gateway/gateway_windows.go diff --git a/Godeps/_workspace/src/github.com/jackpal/go-nat-pmp/LICENSE b/vendor/github.com/jackpal/go-nat-pmp/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/jackpal/go-nat-pmp/LICENSE rename to vendor/github.com/jackpal/go-nat-pmp/LICENSE diff --git a/Godeps/_workspace/src/github.com/jackpal/go-nat-pmp/README.md b/vendor/github.com/jackpal/go-nat-pmp/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/jackpal/go-nat-pmp/README.md rename to vendor/github.com/jackpal/go-nat-pmp/README.md diff --git a/Godeps/_workspace/src/github.com/jackpal/go-nat-pmp/natpmp.go b/vendor/github.com/jackpal/go-nat-pmp/natpmp.go similarity index 100% rename from Godeps/_workspace/src/github.com/jackpal/go-nat-pmp/natpmp.go rename to vendor/github.com/jackpal/go-nat-pmp/natpmp.go diff --git a/Godeps/_workspace/src/github.com/mattn/go-colorable/LICENSE b/vendor/github.com/mattn/go-colorable/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-colorable/LICENSE rename to vendor/github.com/mattn/go-colorable/LICENSE diff --git a/Godeps/_workspace/src/github.com/mattn/go-colorable/README.md b/vendor/github.com/mattn/go-colorable/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-colorable/README.md rename to vendor/github.com/mattn/go-colorable/README.md diff --git a/Godeps/_workspace/src/github.com/mattn/go-colorable/colorable_others.go b/vendor/github.com/mattn/go-colorable/colorable_others.go similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-colorable/colorable_others.go rename to vendor/github.com/mattn/go-colorable/colorable_others.go diff --git a/Godeps/_workspace/src/github.com/mattn/go-colorable/colorable_windows.go b/vendor/github.com/mattn/go-colorable/colorable_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-colorable/colorable_windows.go rename to vendor/github.com/mattn/go-colorable/colorable_windows.go diff --git a/Godeps/_workspace/src/github.com/mattn/go-isatty/LICENSE b/vendor/github.com/mattn/go-isatty/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-isatty/LICENSE rename to vendor/github.com/mattn/go-isatty/LICENSE diff --git a/Godeps/_workspace/src/github.com/mattn/go-isatty/README.md b/vendor/github.com/mattn/go-isatty/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-isatty/README.md rename to vendor/github.com/mattn/go-isatty/README.md diff --git a/Godeps/_workspace/src/github.com/mattn/go-isatty/doc.go b/vendor/github.com/mattn/go-isatty/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-isatty/doc.go rename to vendor/github.com/mattn/go-isatty/doc.go diff --git a/Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_appengine.go b/vendor/github.com/mattn/go-isatty/isatty_appengine.go similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_appengine.go rename to vendor/github.com/mattn/go-isatty/isatty_appengine.go diff --git a/Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_bsd.go b/vendor/github.com/mattn/go-isatty/isatty_bsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_bsd.go rename to vendor/github.com/mattn/go-isatty/isatty_bsd.go diff --git a/Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_linux.go b/vendor/github.com/mattn/go-isatty/isatty_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_linux.go rename to vendor/github.com/mattn/go-isatty/isatty_linux.go diff --git a/Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_solaris.go b/vendor/github.com/mattn/go-isatty/isatty_solaris.go similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_solaris.go rename to vendor/github.com/mattn/go-isatty/isatty_solaris.go diff --git a/Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_windows.go b/vendor/github.com/mattn/go-isatty/isatty_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_windows.go rename to vendor/github.com/mattn/go-isatty/isatty_windows.go diff --git a/Godeps/_workspace/src/github.com/mattn/go-runewidth/.travis.yml b/vendor/github.com/mattn/go-runewidth/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-runewidth/.travis.yml rename to vendor/github.com/mattn/go-runewidth/.travis.yml diff --git a/Godeps/_workspace/src/github.com/mattn/go-runewidth/README.mkd b/vendor/github.com/mattn/go-runewidth/README.mkd similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-runewidth/README.mkd rename to vendor/github.com/mattn/go-runewidth/README.mkd diff --git a/Godeps/_workspace/src/github.com/mattn/go-runewidth/runewidth.go b/vendor/github.com/mattn/go-runewidth/runewidth.go similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-runewidth/runewidth.go rename to vendor/github.com/mattn/go-runewidth/runewidth.go diff --git a/Godeps/_workspace/src/github.com/mattn/go-runewidth/runewidth_js.go b/vendor/github.com/mattn/go-runewidth/runewidth_js.go similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-runewidth/runewidth_js.go rename to vendor/github.com/mattn/go-runewidth/runewidth_js.go diff --git a/Godeps/_workspace/src/github.com/mattn/go-runewidth/runewidth_posix.go b/vendor/github.com/mattn/go-runewidth/runewidth_posix.go similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-runewidth/runewidth_posix.go rename to vendor/github.com/mattn/go-runewidth/runewidth_posix.go diff --git a/Godeps/_workspace/src/github.com/mattn/go-runewidth/runewidth_windows.go b/vendor/github.com/mattn/go-runewidth/runewidth_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/mattn/go-runewidth/runewidth_windows.go rename to vendor/github.com/mattn/go-runewidth/runewidth_windows.go diff --git a/Godeps/_workspace/src/github.com/microsoft/go-winio/LICENSE b/vendor/github.com/microsoft/go-winio/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/microsoft/go-winio/LICENSE rename to vendor/github.com/microsoft/go-winio/LICENSE diff --git a/Godeps/_workspace/src/github.com/microsoft/go-winio/README.md b/vendor/github.com/microsoft/go-winio/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/microsoft/go-winio/README.md rename to vendor/github.com/microsoft/go-winio/README.md diff --git a/Godeps/_workspace/src/github.com/microsoft/go-winio/backup.go b/vendor/github.com/microsoft/go-winio/backup.go similarity index 100% rename from Godeps/_workspace/src/github.com/microsoft/go-winio/backup.go rename to vendor/github.com/microsoft/go-winio/backup.go diff --git a/Godeps/_workspace/src/github.com/microsoft/go-winio/file.go b/vendor/github.com/microsoft/go-winio/file.go similarity index 100% rename from Godeps/_workspace/src/github.com/microsoft/go-winio/file.go rename to vendor/github.com/microsoft/go-winio/file.go diff --git a/Godeps/_workspace/src/github.com/microsoft/go-winio/fileinfo.go b/vendor/github.com/microsoft/go-winio/fileinfo.go similarity index 100% rename from Godeps/_workspace/src/github.com/microsoft/go-winio/fileinfo.go rename to vendor/github.com/microsoft/go-winio/fileinfo.go diff --git a/Godeps/_workspace/src/github.com/microsoft/go-winio/pipe.go b/vendor/github.com/microsoft/go-winio/pipe.go similarity index 100% rename from Godeps/_workspace/src/github.com/microsoft/go-winio/pipe.go rename to vendor/github.com/microsoft/go-winio/pipe.go diff --git a/Godeps/_workspace/src/github.com/microsoft/go-winio/privilege.go b/vendor/github.com/microsoft/go-winio/privilege.go similarity index 100% rename from Godeps/_workspace/src/github.com/microsoft/go-winio/privilege.go rename to vendor/github.com/microsoft/go-winio/privilege.go diff --git a/Godeps/_workspace/src/github.com/microsoft/go-winio/reparse.go b/vendor/github.com/microsoft/go-winio/reparse.go similarity index 100% rename from Godeps/_workspace/src/github.com/microsoft/go-winio/reparse.go rename to vendor/github.com/microsoft/go-winio/reparse.go diff --git a/Godeps/_workspace/src/github.com/microsoft/go-winio/sd.go b/vendor/github.com/microsoft/go-winio/sd.go similarity index 100% rename from Godeps/_workspace/src/github.com/microsoft/go-winio/sd.go rename to vendor/github.com/microsoft/go-winio/sd.go diff --git a/Godeps/_workspace/src/github.com/microsoft/go-winio/syscall.go b/vendor/github.com/microsoft/go-winio/syscall.go similarity index 100% rename from Godeps/_workspace/src/github.com/microsoft/go-winio/syscall.go rename to vendor/github.com/microsoft/go-winio/syscall.go diff --git a/Godeps/_workspace/src/github.com/microsoft/go-winio/zsyscall.go b/vendor/github.com/microsoft/go-winio/zsyscall.go similarity index 100% rename from Godeps/_workspace/src/github.com/microsoft/go-winio/zsyscall.go rename to vendor/github.com/microsoft/go-winio/zsyscall.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/AUTHORS b/vendor/github.com/nsf/termbox-go/AUTHORS similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/AUTHORS rename to vendor/github.com/nsf/termbox-go/AUTHORS diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/LICENSE b/vendor/github.com/nsf/termbox-go/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/LICENSE rename to vendor/github.com/nsf/termbox-go/LICENSE diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/README.md b/vendor/github.com/nsf/termbox-go/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/README.md rename to vendor/github.com/nsf/termbox-go/README.md diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/api.go b/vendor/github.com/nsf/termbox-go/api.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/api.go rename to vendor/github.com/nsf/termbox-go/api.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/api_common.go b/vendor/github.com/nsf/termbox-go/api_common.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/api_common.go rename to vendor/github.com/nsf/termbox-go/api_common.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/api_windows.go b/vendor/github.com/nsf/termbox-go/api_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/api_windows.go rename to vendor/github.com/nsf/termbox-go/api_windows.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/collect_terminfo.py b/vendor/github.com/nsf/termbox-go/collect_terminfo.py similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/collect_terminfo.py rename to vendor/github.com/nsf/termbox-go/collect_terminfo.py diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls.go b/vendor/github.com/nsf/termbox-go/syscalls.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls.go rename to vendor/github.com/nsf/termbox-go/syscalls.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls_darwin.go b/vendor/github.com/nsf/termbox-go/syscalls_darwin.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls_darwin.go rename to vendor/github.com/nsf/termbox-go/syscalls_darwin.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls_darwin_amd64.go b/vendor/github.com/nsf/termbox-go/syscalls_darwin_amd64.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls_darwin_amd64.go rename to vendor/github.com/nsf/termbox-go/syscalls_darwin_amd64.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls_freebsd.go b/vendor/github.com/nsf/termbox-go/syscalls_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls_freebsd.go rename to vendor/github.com/nsf/termbox-go/syscalls_freebsd.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls_linux.go b/vendor/github.com/nsf/termbox-go/syscalls_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls_linux.go rename to vendor/github.com/nsf/termbox-go/syscalls_linux.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls_netbsd.go b/vendor/github.com/nsf/termbox-go/syscalls_netbsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls_netbsd.go rename to vendor/github.com/nsf/termbox-go/syscalls_netbsd.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls_openbsd.go b/vendor/github.com/nsf/termbox-go/syscalls_openbsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls_openbsd.go rename to vendor/github.com/nsf/termbox-go/syscalls_openbsd.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls_windows.go b/vendor/github.com/nsf/termbox-go/syscalls_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/syscalls_windows.go rename to vendor/github.com/nsf/termbox-go/syscalls_windows.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/termbox.go b/vendor/github.com/nsf/termbox-go/termbox.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/termbox.go rename to vendor/github.com/nsf/termbox-go/termbox.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/termbox_common.go b/vendor/github.com/nsf/termbox-go/termbox_common.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/termbox_common.go rename to vendor/github.com/nsf/termbox-go/termbox_common.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/termbox_windows.go b/vendor/github.com/nsf/termbox-go/termbox_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/termbox_windows.go rename to vendor/github.com/nsf/termbox-go/termbox_windows.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/terminfo.go b/vendor/github.com/nsf/termbox-go/terminfo.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/terminfo.go rename to vendor/github.com/nsf/termbox-go/terminfo.go diff --git a/Godeps/_workspace/src/github.com/nsf/termbox-go/terminfo_builtin.go b/vendor/github.com/nsf/termbox-go/terminfo_builtin.go similarity index 100% rename from Godeps/_workspace/src/github.com/nsf/termbox-go/terminfo_builtin.go rename to vendor/github.com/nsf/termbox-go/terminfo_builtin.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/.travis.yml b/vendor/github.com/pborman/uuid/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/.travis.yml rename to vendor/github.com/pborman/uuid/.travis.yml diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/CONTRIBUTORS b/vendor/github.com/pborman/uuid/CONTRIBUTORS similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/CONTRIBUTORS rename to vendor/github.com/pborman/uuid/CONTRIBUTORS diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE b/vendor/github.com/pborman/uuid/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/LICENSE rename to vendor/github.com/pborman/uuid/LICENSE diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/README.md b/vendor/github.com/pborman/uuid/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/README.md rename to vendor/github.com/pborman/uuid/README.md diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/dce.go b/vendor/github.com/pborman/uuid/dce.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/dce.go rename to vendor/github.com/pborman/uuid/dce.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/doc.go b/vendor/github.com/pborman/uuid/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/doc.go rename to vendor/github.com/pborman/uuid/doc.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/hash.go b/vendor/github.com/pborman/uuid/hash.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/hash.go rename to vendor/github.com/pborman/uuid/hash.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/json.go b/vendor/github.com/pborman/uuid/json.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/json.go rename to vendor/github.com/pborman/uuid/json.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/node.go b/vendor/github.com/pborman/uuid/node.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/node.go rename to vendor/github.com/pborman/uuid/node.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/sql.go b/vendor/github.com/pborman/uuid/sql.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/sql.go rename to vendor/github.com/pborman/uuid/sql.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/time.go b/vendor/github.com/pborman/uuid/time.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/time.go rename to vendor/github.com/pborman/uuid/time.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/util.go b/vendor/github.com/pborman/uuid/util.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/util.go rename to vendor/github.com/pborman/uuid/util.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/uuid.go b/vendor/github.com/pborman/uuid/uuid.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/uuid.go rename to vendor/github.com/pborman/uuid/uuid.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/version1.go b/vendor/github.com/pborman/uuid/version1.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/version1.go rename to vendor/github.com/pborman/uuid/version1.go diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/version4.go b/vendor/github.com/pborman/uuid/version4.go similarity index 100% rename from Godeps/_workspace/src/github.com/pborman/uuid/version4.go rename to vendor/github.com/pborman/uuid/version4.go diff --git a/Godeps/_workspace/src/github.com/peterh/liner/COPYING b/vendor/github.com/peterh/liner/COPYING similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/COPYING rename to vendor/github.com/peterh/liner/COPYING diff --git a/Godeps/_workspace/src/github.com/peterh/liner/README.md b/vendor/github.com/peterh/liner/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/README.md rename to vendor/github.com/peterh/liner/README.md diff --git a/Godeps/_workspace/src/github.com/peterh/liner/bsdinput.go b/vendor/github.com/peterh/liner/bsdinput.go similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/bsdinput.go rename to vendor/github.com/peterh/liner/bsdinput.go diff --git a/Godeps/_workspace/src/github.com/peterh/liner/common.go b/vendor/github.com/peterh/liner/common.go similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/common.go rename to vendor/github.com/peterh/liner/common.go diff --git a/Godeps/_workspace/src/github.com/peterh/liner/fallbackinput.go b/vendor/github.com/peterh/liner/fallbackinput.go similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/fallbackinput.go rename to vendor/github.com/peterh/liner/fallbackinput.go diff --git a/Godeps/_workspace/src/github.com/peterh/liner/input.go b/vendor/github.com/peterh/liner/input.go similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/input.go rename to vendor/github.com/peterh/liner/input.go diff --git a/Godeps/_workspace/src/github.com/peterh/liner/input_darwin.go b/vendor/github.com/peterh/liner/input_darwin.go similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/input_darwin.go rename to vendor/github.com/peterh/liner/input_darwin.go diff --git a/Godeps/_workspace/src/github.com/peterh/liner/input_linux.go b/vendor/github.com/peterh/liner/input_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/input_linux.go rename to vendor/github.com/peterh/liner/input_linux.go diff --git a/Godeps/_workspace/src/github.com/peterh/liner/input_windows.go b/vendor/github.com/peterh/liner/input_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/input_windows.go rename to vendor/github.com/peterh/liner/input_windows.go diff --git a/Godeps/_workspace/src/github.com/peterh/liner/line.go b/vendor/github.com/peterh/liner/line.go similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/line.go rename to vendor/github.com/peterh/liner/line.go diff --git a/Godeps/_workspace/src/github.com/peterh/liner/output.go b/vendor/github.com/peterh/liner/output.go similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/output.go rename to vendor/github.com/peterh/liner/output.go diff --git a/Godeps/_workspace/src/github.com/peterh/liner/output_windows.go b/vendor/github.com/peterh/liner/output_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/output_windows.go rename to vendor/github.com/peterh/liner/output_windows.go diff --git a/Godeps/_workspace/src/github.com/peterh/liner/signal.go b/vendor/github.com/peterh/liner/signal.go similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/signal.go rename to vendor/github.com/peterh/liner/signal.go diff --git a/Godeps/_workspace/src/github.com/peterh/liner/signal_legacy.go b/vendor/github.com/peterh/liner/signal_legacy.go similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/signal_legacy.go rename to vendor/github.com/peterh/liner/signal_legacy.go diff --git a/Godeps/_workspace/src/github.com/peterh/liner/unixmode.go b/vendor/github.com/peterh/liner/unixmode.go similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/unixmode.go rename to vendor/github.com/peterh/liner/unixmode.go diff --git a/Godeps/_workspace/src/github.com/peterh/liner/width.go b/vendor/github.com/peterh/liner/width.go similarity index 100% rename from Godeps/_workspace/src/github.com/peterh/liner/width.go rename to vendor/github.com/peterh/liner/width.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/.gitignore b/vendor/github.com/rcrowley/go-metrics/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/.gitignore rename to vendor/github.com/rcrowley/go-metrics/.gitignore diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/.travis.yml b/vendor/github.com/rcrowley/go-metrics/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/.travis.yml rename to vendor/github.com/rcrowley/go-metrics/.travis.yml diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/LICENSE b/vendor/github.com/rcrowley/go-metrics/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/LICENSE rename to vendor/github.com/rcrowley/go-metrics/LICENSE diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/README.md b/vendor/github.com/rcrowley/go-metrics/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/README.md rename to vendor/github.com/rcrowley/go-metrics/README.md diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/cmd/metrics-bench/metrics-bench.go b/vendor/github.com/rcrowley/go-metrics/cmd/metrics-bench/metrics-bench.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/cmd/metrics-bench/metrics-bench.go rename to vendor/github.com/rcrowley/go-metrics/cmd/metrics-bench/metrics-bench.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/cmd/metrics-example/metrics-example.go b/vendor/github.com/rcrowley/go-metrics/cmd/metrics-example/metrics-example.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/cmd/metrics-example/metrics-example.go rename to vendor/github.com/rcrowley/go-metrics/cmd/metrics-example/metrics-example.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/cmd/never-read/never-read.go b/vendor/github.com/rcrowley/go-metrics/cmd/never-read/never-read.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/cmd/never-read/never-read.go rename to vendor/github.com/rcrowley/go-metrics/cmd/never-read/never-read.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/counter.go b/vendor/github.com/rcrowley/go-metrics/counter.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/counter.go rename to vendor/github.com/rcrowley/go-metrics/counter.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/debug.go b/vendor/github.com/rcrowley/go-metrics/debug.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/debug.go rename to vendor/github.com/rcrowley/go-metrics/debug.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/ewma.go b/vendor/github.com/rcrowley/go-metrics/ewma.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/ewma.go rename to vendor/github.com/rcrowley/go-metrics/ewma.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/exp/exp.go b/vendor/github.com/rcrowley/go-metrics/exp/exp.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/exp/exp.go rename to vendor/github.com/rcrowley/go-metrics/exp/exp.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/gauge.go b/vendor/github.com/rcrowley/go-metrics/gauge.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/gauge.go rename to vendor/github.com/rcrowley/go-metrics/gauge.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/gauge_float64.go b/vendor/github.com/rcrowley/go-metrics/gauge_float64.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/gauge_float64.go rename to vendor/github.com/rcrowley/go-metrics/gauge_float64.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/graphite.go b/vendor/github.com/rcrowley/go-metrics/graphite.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/graphite.go rename to vendor/github.com/rcrowley/go-metrics/graphite.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/healthcheck.go b/vendor/github.com/rcrowley/go-metrics/healthcheck.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/healthcheck.go rename to vendor/github.com/rcrowley/go-metrics/healthcheck.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/histogram.go b/vendor/github.com/rcrowley/go-metrics/histogram.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/histogram.go rename to vendor/github.com/rcrowley/go-metrics/histogram.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/json.go b/vendor/github.com/rcrowley/go-metrics/json.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/json.go rename to vendor/github.com/rcrowley/go-metrics/json.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/librato/client.go b/vendor/github.com/rcrowley/go-metrics/librato/client.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/librato/client.go rename to vendor/github.com/rcrowley/go-metrics/librato/client.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/librato/librato.go b/vendor/github.com/rcrowley/go-metrics/librato/librato.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/librato/librato.go rename to vendor/github.com/rcrowley/go-metrics/librato/librato.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/log.go b/vendor/github.com/rcrowley/go-metrics/log.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/log.go rename to vendor/github.com/rcrowley/go-metrics/log.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/memory.md b/vendor/github.com/rcrowley/go-metrics/memory.md similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/memory.md rename to vendor/github.com/rcrowley/go-metrics/memory.md diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/meter.go b/vendor/github.com/rcrowley/go-metrics/meter.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/meter.go rename to vendor/github.com/rcrowley/go-metrics/meter.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/metrics.go b/vendor/github.com/rcrowley/go-metrics/metrics.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/metrics.go rename to vendor/github.com/rcrowley/go-metrics/metrics.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/opentsdb.go b/vendor/github.com/rcrowley/go-metrics/opentsdb.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/opentsdb.go rename to vendor/github.com/rcrowley/go-metrics/opentsdb.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/registry.go b/vendor/github.com/rcrowley/go-metrics/registry.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/registry.go rename to vendor/github.com/rcrowley/go-metrics/registry.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/runtime.go b/vendor/github.com/rcrowley/go-metrics/runtime.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/runtime.go rename to vendor/github.com/rcrowley/go-metrics/runtime.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/runtime_cgo.go b/vendor/github.com/rcrowley/go-metrics/runtime_cgo.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/runtime_cgo.go rename to vendor/github.com/rcrowley/go-metrics/runtime_cgo.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/runtime_gccpufraction.go b/vendor/github.com/rcrowley/go-metrics/runtime_gccpufraction.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/runtime_gccpufraction.go rename to vendor/github.com/rcrowley/go-metrics/runtime_gccpufraction.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/runtime_no_cgo.go b/vendor/github.com/rcrowley/go-metrics/runtime_no_cgo.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/runtime_no_cgo.go rename to vendor/github.com/rcrowley/go-metrics/runtime_no_cgo.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/runtime_no_gccpufraction.go b/vendor/github.com/rcrowley/go-metrics/runtime_no_gccpufraction.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/runtime_no_gccpufraction.go rename to vendor/github.com/rcrowley/go-metrics/runtime_no_gccpufraction.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/sample.go b/vendor/github.com/rcrowley/go-metrics/sample.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/sample.go rename to vendor/github.com/rcrowley/go-metrics/sample.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/stathat/stathat.go b/vendor/github.com/rcrowley/go-metrics/stathat/stathat.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/stathat/stathat.go rename to vendor/github.com/rcrowley/go-metrics/stathat/stathat.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/syslog.go b/vendor/github.com/rcrowley/go-metrics/syslog.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/syslog.go rename to vendor/github.com/rcrowley/go-metrics/syslog.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/timer.go b/vendor/github.com/rcrowley/go-metrics/timer.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/timer.go rename to vendor/github.com/rcrowley/go-metrics/timer.go diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/validate.sh b/vendor/github.com/rcrowley/go-metrics/validate.sh similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/validate.sh rename to vendor/github.com/rcrowley/go-metrics/validate.sh diff --git a/Godeps/_workspace/src/github.com/rcrowley/go-metrics/writer.go b/vendor/github.com/rcrowley/go-metrics/writer.go similarity index 100% rename from Godeps/_workspace/src/github.com/rcrowley/go-metrics/writer.go rename to vendor/github.com/rcrowley/go-metrics/writer.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/.gitignore b/vendor/github.com/rjeczalik/notify/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/.gitignore rename to vendor/github.com/rjeczalik/notify/.gitignore diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/.travis.yml b/vendor/github.com/rjeczalik/notify/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/.travis.yml rename to vendor/github.com/rjeczalik/notify/.travis.yml diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/AUTHORS b/vendor/github.com/rjeczalik/notify/AUTHORS similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/AUTHORS rename to vendor/github.com/rjeczalik/notify/AUTHORS diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/LICENSE b/vendor/github.com/rjeczalik/notify/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/LICENSE rename to vendor/github.com/rjeczalik/notify/LICENSE diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/README.md b/vendor/github.com/rjeczalik/notify/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/README.md rename to vendor/github.com/rjeczalik/notify/README.md diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/appveyor.yml b/vendor/github.com/rjeczalik/notify/appveyor.yml similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/appveyor.yml rename to vendor/github.com/rjeczalik/notify/appveyor.yml diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/debug.go b/vendor/github.com/rjeczalik/notify/debug.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/debug.go rename to vendor/github.com/rjeczalik/notify/debug.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/debug_debug.go b/vendor/github.com/rjeczalik/notify/debug_debug.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/debug_debug.go rename to vendor/github.com/rjeczalik/notify/debug_debug.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/doc.go b/vendor/github.com/rjeczalik/notify/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/doc.go rename to vendor/github.com/rjeczalik/notify/doc.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/event.go b/vendor/github.com/rjeczalik/notify/event.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/event.go rename to vendor/github.com/rjeczalik/notify/event.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/event_fen.go b/vendor/github.com/rjeczalik/notify/event_fen.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/event_fen.go rename to vendor/github.com/rjeczalik/notify/event_fen.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/event_fsevents.go b/vendor/github.com/rjeczalik/notify/event_fsevents.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/event_fsevents.go rename to vendor/github.com/rjeczalik/notify/event_fsevents.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/event_inotify.go b/vendor/github.com/rjeczalik/notify/event_inotify.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/event_inotify.go rename to vendor/github.com/rjeczalik/notify/event_inotify.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/event_kqueue.go b/vendor/github.com/rjeczalik/notify/event_kqueue.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/event_kqueue.go rename to vendor/github.com/rjeczalik/notify/event_kqueue.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/event_readdcw.go b/vendor/github.com/rjeczalik/notify/event_readdcw.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/event_readdcw.go rename to vendor/github.com/rjeczalik/notify/event_readdcw.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/event_stub.go b/vendor/github.com/rjeczalik/notify/event_stub.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/event_stub.go rename to vendor/github.com/rjeczalik/notify/event_stub.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/event_trigger.go b/vendor/github.com/rjeczalik/notify/event_trigger.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/event_trigger.go rename to vendor/github.com/rjeczalik/notify/event_trigger.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/node.go b/vendor/github.com/rjeczalik/notify/node.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/node.go rename to vendor/github.com/rjeczalik/notify/node.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/notify.go b/vendor/github.com/rjeczalik/notify/notify.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/notify.go rename to vendor/github.com/rjeczalik/notify/notify.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/tree.go b/vendor/github.com/rjeczalik/notify/tree.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/tree.go rename to vendor/github.com/rjeczalik/notify/tree.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/tree_nonrecursive.go b/vendor/github.com/rjeczalik/notify/tree_nonrecursive.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/tree_nonrecursive.go rename to vendor/github.com/rjeczalik/notify/tree_nonrecursive.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/tree_recursive.go b/vendor/github.com/rjeczalik/notify/tree_recursive.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/tree_recursive.go rename to vendor/github.com/rjeczalik/notify/tree_recursive.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/util.go b/vendor/github.com/rjeczalik/notify/util.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/util.go rename to vendor/github.com/rjeczalik/notify/util.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/watcher.go b/vendor/github.com/rjeczalik/notify/watcher.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/watcher.go rename to vendor/github.com/rjeczalik/notify/watcher.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_fen.go b/vendor/github.com/rjeczalik/notify/watcher_fen.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_fen.go rename to vendor/github.com/rjeczalik/notify/watcher_fen.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_fen_cgo.go b/vendor/github.com/rjeczalik/notify/watcher_fen_cgo.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_fen_cgo.go rename to vendor/github.com/rjeczalik/notify/watcher_fen_cgo.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_fsevents.go b/vendor/github.com/rjeczalik/notify/watcher_fsevents.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_fsevents.go rename to vendor/github.com/rjeczalik/notify/watcher_fsevents.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_fsevents_cgo.go b/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_fsevents_cgo.go rename to vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_inotify.go b/vendor/github.com/rjeczalik/notify/watcher_inotify.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_inotify.go rename to vendor/github.com/rjeczalik/notify/watcher_inotify.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_kqueue.go b/vendor/github.com/rjeczalik/notify/watcher_kqueue.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_kqueue.go rename to vendor/github.com/rjeczalik/notify/watcher_kqueue.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_readdcw.go b/vendor/github.com/rjeczalik/notify/watcher_readdcw.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_readdcw.go rename to vendor/github.com/rjeczalik/notify/watcher_readdcw.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_stub.go b/vendor/github.com/rjeczalik/notify/watcher_stub.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_stub.go rename to vendor/github.com/rjeczalik/notify/watcher_stub.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_trigger.go b/vendor/github.com/rjeczalik/notify/watcher_trigger.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_trigger.go rename to vendor/github.com/rjeczalik/notify/watcher_trigger.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/watchpoint.go b/vendor/github.com/rjeczalik/notify/watchpoint.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/watchpoint.go rename to vendor/github.com/rjeczalik/notify/watchpoint.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/watchpoint_other.go b/vendor/github.com/rjeczalik/notify/watchpoint_other.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/watchpoint_other.go rename to vendor/github.com/rjeczalik/notify/watchpoint_other.go diff --git a/Godeps/_workspace/src/github.com/rjeczalik/notify/watchpoint_readdcw.go b/vendor/github.com/rjeczalik/notify/watchpoint_readdcw.go similarity index 100% rename from Godeps/_workspace/src/github.com/rjeczalik/notify/watchpoint_readdcw.go rename to vendor/github.com/rjeczalik/notify/watchpoint_readdcw.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/.gitignore b/vendor/github.com/robertkrimen/otto/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/.gitignore rename to vendor/github.com/robertkrimen/otto/.gitignore diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/DESIGN.markdown b/vendor/github.com/robertkrimen/otto/DESIGN.markdown similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/DESIGN.markdown rename to vendor/github.com/robertkrimen/otto/DESIGN.markdown diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/LICENSE b/vendor/github.com/robertkrimen/otto/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/LICENSE rename to vendor/github.com/robertkrimen/otto/LICENSE diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/Makefile b/vendor/github.com/robertkrimen/otto/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/Makefile rename to vendor/github.com/robertkrimen/otto/Makefile diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/README.markdown b/vendor/github.com/robertkrimen/otto/README.markdown similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/README.markdown rename to vendor/github.com/robertkrimen/otto/README.markdown diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/ast/README.markdown b/vendor/github.com/robertkrimen/otto/ast/README.markdown similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/ast/README.markdown rename to vendor/github.com/robertkrimen/otto/ast/README.markdown diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/ast/comments.go b/vendor/github.com/robertkrimen/otto/ast/comments.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/ast/comments.go rename to vendor/github.com/robertkrimen/otto/ast/comments.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/ast/node.go b/vendor/github.com/robertkrimen/otto/ast/node.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/ast/node.go rename to vendor/github.com/robertkrimen/otto/ast/node.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/builtin.go b/vendor/github.com/robertkrimen/otto/builtin.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/builtin.go rename to vendor/github.com/robertkrimen/otto/builtin.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_array.go b/vendor/github.com/robertkrimen/otto/builtin_array.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_array.go rename to vendor/github.com/robertkrimen/otto/builtin_array.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_boolean.go b/vendor/github.com/robertkrimen/otto/builtin_boolean.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_boolean.go rename to vendor/github.com/robertkrimen/otto/builtin_boolean.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_date.go b/vendor/github.com/robertkrimen/otto/builtin_date.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_date.go rename to vendor/github.com/robertkrimen/otto/builtin_date.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_error.go b/vendor/github.com/robertkrimen/otto/builtin_error.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_error.go rename to vendor/github.com/robertkrimen/otto/builtin_error.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_function.go b/vendor/github.com/robertkrimen/otto/builtin_function.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_function.go rename to vendor/github.com/robertkrimen/otto/builtin_function.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_json.go b/vendor/github.com/robertkrimen/otto/builtin_json.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_json.go rename to vendor/github.com/robertkrimen/otto/builtin_json.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_math.go b/vendor/github.com/robertkrimen/otto/builtin_math.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_math.go rename to vendor/github.com/robertkrimen/otto/builtin_math.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_number.go b/vendor/github.com/robertkrimen/otto/builtin_number.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_number.go rename to vendor/github.com/robertkrimen/otto/builtin_number.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_object.go b/vendor/github.com/robertkrimen/otto/builtin_object.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_object.go rename to vendor/github.com/robertkrimen/otto/builtin_object.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_regexp.go b/vendor/github.com/robertkrimen/otto/builtin_regexp.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_regexp.go rename to vendor/github.com/robertkrimen/otto/builtin_regexp.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_string.go b/vendor/github.com/robertkrimen/otto/builtin_string.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/builtin_string.go rename to vendor/github.com/robertkrimen/otto/builtin_string.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/clone.go b/vendor/github.com/robertkrimen/otto/clone.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/clone.go rename to vendor/github.com/robertkrimen/otto/clone.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/cmpl.go b/vendor/github.com/robertkrimen/otto/cmpl.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/cmpl.go rename to vendor/github.com/robertkrimen/otto/cmpl.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/cmpl_evaluate.go b/vendor/github.com/robertkrimen/otto/cmpl_evaluate.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/cmpl_evaluate.go rename to vendor/github.com/robertkrimen/otto/cmpl_evaluate.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/cmpl_evaluate_expression.go b/vendor/github.com/robertkrimen/otto/cmpl_evaluate_expression.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/cmpl_evaluate_expression.go rename to vendor/github.com/robertkrimen/otto/cmpl_evaluate_expression.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/cmpl_evaluate_statement.go b/vendor/github.com/robertkrimen/otto/cmpl_evaluate_statement.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/cmpl_evaluate_statement.go rename to vendor/github.com/robertkrimen/otto/cmpl_evaluate_statement.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/cmpl_parse.go b/vendor/github.com/robertkrimen/otto/cmpl_parse.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/cmpl_parse.go rename to vendor/github.com/robertkrimen/otto/cmpl_parse.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/console.go b/vendor/github.com/robertkrimen/otto/console.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/console.go rename to vendor/github.com/robertkrimen/otto/console.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/dbg.go b/vendor/github.com/robertkrimen/otto/dbg.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/dbg.go rename to vendor/github.com/robertkrimen/otto/dbg.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/dbg/dbg.go b/vendor/github.com/robertkrimen/otto/dbg/dbg.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/dbg/dbg.go rename to vendor/github.com/robertkrimen/otto/dbg/dbg.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/error.go b/vendor/github.com/robertkrimen/otto/error.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/error.go rename to vendor/github.com/robertkrimen/otto/error.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/evaluate.go b/vendor/github.com/robertkrimen/otto/evaluate.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/evaluate.go rename to vendor/github.com/robertkrimen/otto/evaluate.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/file/README.markdown b/vendor/github.com/robertkrimen/otto/file/README.markdown similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/file/README.markdown rename to vendor/github.com/robertkrimen/otto/file/README.markdown diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/file/file.go b/vendor/github.com/robertkrimen/otto/file/file.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/file/file.go rename to vendor/github.com/robertkrimen/otto/file/file.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/global.go b/vendor/github.com/robertkrimen/otto/global.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/global.go rename to vendor/github.com/robertkrimen/otto/global.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/inline b/vendor/github.com/robertkrimen/otto/inline similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/inline rename to vendor/github.com/robertkrimen/otto/inline diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/inline.go b/vendor/github.com/robertkrimen/otto/inline.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/inline.go rename to vendor/github.com/robertkrimen/otto/inline.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/object.go b/vendor/github.com/robertkrimen/otto/object.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/object.go rename to vendor/github.com/robertkrimen/otto/object.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/object_class.go b/vendor/github.com/robertkrimen/otto/object_class.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/object_class.go rename to vendor/github.com/robertkrimen/otto/object_class.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/otto.go b/vendor/github.com/robertkrimen/otto/otto.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/otto.go rename to vendor/github.com/robertkrimen/otto/otto.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/otto/Makefile b/vendor/github.com/robertkrimen/otto/otto/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/otto/Makefile rename to vendor/github.com/robertkrimen/otto/otto/Makefile diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/otto/main.go b/vendor/github.com/robertkrimen/otto/otto/main.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/otto/main.go rename to vendor/github.com/robertkrimen/otto/otto/main.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/otto_.go b/vendor/github.com/robertkrimen/otto/otto_.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/otto_.go rename to vendor/github.com/robertkrimen/otto/otto_.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/parser/Makefile b/vendor/github.com/robertkrimen/otto/parser/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/parser/Makefile rename to vendor/github.com/robertkrimen/otto/parser/Makefile diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/parser/README.markdown b/vendor/github.com/robertkrimen/otto/parser/README.markdown similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/parser/README.markdown rename to vendor/github.com/robertkrimen/otto/parser/README.markdown diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/parser/dbg.go b/vendor/github.com/robertkrimen/otto/parser/dbg.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/parser/dbg.go rename to vendor/github.com/robertkrimen/otto/parser/dbg.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/parser/error.go b/vendor/github.com/robertkrimen/otto/parser/error.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/parser/error.go rename to vendor/github.com/robertkrimen/otto/parser/error.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/parser/expression.go b/vendor/github.com/robertkrimen/otto/parser/expression.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/parser/expression.go rename to vendor/github.com/robertkrimen/otto/parser/expression.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/parser/lexer.go b/vendor/github.com/robertkrimen/otto/parser/lexer.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/parser/lexer.go rename to vendor/github.com/robertkrimen/otto/parser/lexer.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/parser/parser.go b/vendor/github.com/robertkrimen/otto/parser/parser.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/parser/parser.go rename to vendor/github.com/robertkrimen/otto/parser/parser.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/parser/regexp.go b/vendor/github.com/robertkrimen/otto/parser/regexp.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/parser/regexp.go rename to vendor/github.com/robertkrimen/otto/parser/regexp.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/parser/scope.go b/vendor/github.com/robertkrimen/otto/parser/scope.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/parser/scope.go rename to vendor/github.com/robertkrimen/otto/parser/scope.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/parser/statement.go b/vendor/github.com/robertkrimen/otto/parser/statement.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/parser/statement.go rename to vendor/github.com/robertkrimen/otto/parser/statement.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/property.go b/vendor/github.com/robertkrimen/otto/property.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/property.go rename to vendor/github.com/robertkrimen/otto/property.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/registry/README.markdown b/vendor/github.com/robertkrimen/otto/registry/README.markdown similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/registry/README.markdown rename to vendor/github.com/robertkrimen/otto/registry/README.markdown diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/registry/registry.go b/vendor/github.com/robertkrimen/otto/registry/registry.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/registry/registry.go rename to vendor/github.com/robertkrimen/otto/registry/registry.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/repl/repl.go b/vendor/github.com/robertkrimen/otto/repl/repl.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/repl/repl.go rename to vendor/github.com/robertkrimen/otto/repl/repl.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/result.go b/vendor/github.com/robertkrimen/otto/result.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/result.go rename to vendor/github.com/robertkrimen/otto/result.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/runtime.go b/vendor/github.com/robertkrimen/otto/runtime.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/runtime.go rename to vendor/github.com/robertkrimen/otto/runtime.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/scope.go b/vendor/github.com/robertkrimen/otto/scope.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/scope.go rename to vendor/github.com/robertkrimen/otto/scope.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/script.go b/vendor/github.com/robertkrimen/otto/script.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/script.go rename to vendor/github.com/robertkrimen/otto/script.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/stash.go b/vendor/github.com/robertkrimen/otto/stash.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/stash.go rename to vendor/github.com/robertkrimen/otto/stash.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/terst/terst.go b/vendor/github.com/robertkrimen/otto/terst/terst.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/terst/terst.go rename to vendor/github.com/robertkrimen/otto/terst/terst.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/test/Makefile b/vendor/github.com/robertkrimen/otto/test/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/test/Makefile rename to vendor/github.com/robertkrimen/otto/test/Makefile diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/test/tester.go b/vendor/github.com/robertkrimen/otto/test/tester.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/test/tester.go rename to vendor/github.com/robertkrimen/otto/test/tester.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/token/Makefile b/vendor/github.com/robertkrimen/otto/token/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/token/Makefile rename to vendor/github.com/robertkrimen/otto/token/Makefile diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/token/README.markdown b/vendor/github.com/robertkrimen/otto/token/README.markdown similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/token/README.markdown rename to vendor/github.com/robertkrimen/otto/token/README.markdown diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/token/token.go b/vendor/github.com/robertkrimen/otto/token/token.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/token/token.go rename to vendor/github.com/robertkrimen/otto/token/token.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/token/token_const.go b/vendor/github.com/robertkrimen/otto/token/token_const.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/token/token_const.go rename to vendor/github.com/robertkrimen/otto/token/token_const.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/token/tokenfmt b/vendor/github.com/robertkrimen/otto/token/tokenfmt similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/token/tokenfmt rename to vendor/github.com/robertkrimen/otto/token/tokenfmt diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/type_arguments.go b/vendor/github.com/robertkrimen/otto/type_arguments.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/type_arguments.go rename to vendor/github.com/robertkrimen/otto/type_arguments.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/type_array.go b/vendor/github.com/robertkrimen/otto/type_array.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/type_array.go rename to vendor/github.com/robertkrimen/otto/type_array.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/type_boolean.go b/vendor/github.com/robertkrimen/otto/type_boolean.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/type_boolean.go rename to vendor/github.com/robertkrimen/otto/type_boolean.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/type_date.go b/vendor/github.com/robertkrimen/otto/type_date.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/type_date.go rename to vendor/github.com/robertkrimen/otto/type_date.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/type_error.go b/vendor/github.com/robertkrimen/otto/type_error.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/type_error.go rename to vendor/github.com/robertkrimen/otto/type_error.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/type_function.go b/vendor/github.com/robertkrimen/otto/type_function.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/type_function.go rename to vendor/github.com/robertkrimen/otto/type_function.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/type_go_array.go b/vendor/github.com/robertkrimen/otto/type_go_array.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/type_go_array.go rename to vendor/github.com/robertkrimen/otto/type_go_array.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/type_go_map.go b/vendor/github.com/robertkrimen/otto/type_go_map.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/type_go_map.go rename to vendor/github.com/robertkrimen/otto/type_go_map.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/type_go_slice.go b/vendor/github.com/robertkrimen/otto/type_go_slice.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/type_go_slice.go rename to vendor/github.com/robertkrimen/otto/type_go_slice.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/type_go_struct.go b/vendor/github.com/robertkrimen/otto/type_go_struct.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/type_go_struct.go rename to vendor/github.com/robertkrimen/otto/type_go_struct.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/type_number.go b/vendor/github.com/robertkrimen/otto/type_number.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/type_number.go rename to vendor/github.com/robertkrimen/otto/type_number.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/type_reference.go b/vendor/github.com/robertkrimen/otto/type_reference.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/type_reference.go rename to vendor/github.com/robertkrimen/otto/type_reference.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/type_regexp.go b/vendor/github.com/robertkrimen/otto/type_regexp.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/type_regexp.go rename to vendor/github.com/robertkrimen/otto/type_regexp.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/type_string.go b/vendor/github.com/robertkrimen/otto/type_string.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/type_string.go rename to vendor/github.com/robertkrimen/otto/type_string.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/underscore/Makefile b/vendor/github.com/robertkrimen/otto/underscore/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/underscore/Makefile rename to vendor/github.com/robertkrimen/otto/underscore/Makefile diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/underscore/README.markdown b/vendor/github.com/robertkrimen/otto/underscore/README.markdown similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/underscore/README.markdown rename to vendor/github.com/robertkrimen/otto/underscore/README.markdown diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/underscore/source.go b/vendor/github.com/robertkrimen/otto/underscore/source.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/underscore/source.go rename to vendor/github.com/robertkrimen/otto/underscore/source.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/underscore/testify b/vendor/github.com/robertkrimen/otto/underscore/testify similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/underscore/testify rename to vendor/github.com/robertkrimen/otto/underscore/testify diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/underscore/underscore.go b/vendor/github.com/robertkrimen/otto/underscore/underscore.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/underscore/underscore.go rename to vendor/github.com/robertkrimen/otto/underscore/underscore.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/value.go b/vendor/github.com/robertkrimen/otto/value.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/value.go rename to vendor/github.com/robertkrimen/otto/value.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/value_boolean.go b/vendor/github.com/robertkrimen/otto/value_boolean.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/value_boolean.go rename to vendor/github.com/robertkrimen/otto/value_boolean.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/value_number.go b/vendor/github.com/robertkrimen/otto/value_number.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/value_number.go rename to vendor/github.com/robertkrimen/otto/value_number.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/value_primitive.go b/vendor/github.com/robertkrimen/otto/value_primitive.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/value_primitive.go rename to vendor/github.com/robertkrimen/otto/value_primitive.go diff --git a/Godeps/_workspace/src/github.com/robertkrimen/otto/value_string.go b/vendor/github.com/robertkrimen/otto/value_string.go similarity index 100% rename from Godeps/_workspace/src/github.com/robertkrimen/otto/value_string.go rename to vendor/github.com/robertkrimen/otto/value_string.go diff --git a/Godeps/_workspace/src/github.com/rs/cors/.travis.yml b/vendor/github.com/rs/cors/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/rs/cors/.travis.yml rename to vendor/github.com/rs/cors/.travis.yml diff --git a/Godeps/_workspace/src/github.com/rs/cors/LICENSE b/vendor/github.com/rs/cors/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/rs/cors/LICENSE rename to vendor/github.com/rs/cors/LICENSE diff --git a/Godeps/_workspace/src/github.com/rs/cors/README.md b/vendor/github.com/rs/cors/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/rs/cors/README.md rename to vendor/github.com/rs/cors/README.md diff --git a/Godeps/_workspace/src/github.com/rs/cors/cors.go b/vendor/github.com/rs/cors/cors.go similarity index 100% rename from Godeps/_workspace/src/github.com/rs/cors/cors.go rename to vendor/github.com/rs/cors/cors.go diff --git a/Godeps/_workspace/src/github.com/rs/cors/utils.go b/vendor/github.com/rs/cors/utils.go similarity index 100% rename from Godeps/_workspace/src/github.com/rs/cors/utils.go rename to vendor/github.com/rs/cors/utils.go diff --git a/Godeps/_workspace/src/github.com/rs/xhandler/.travis.yml b/vendor/github.com/rs/xhandler/.travis.yml similarity index 100% rename from Godeps/_workspace/src/github.com/rs/xhandler/.travis.yml rename to vendor/github.com/rs/xhandler/.travis.yml diff --git a/Godeps/_workspace/src/github.com/rs/xhandler/LICENSE b/vendor/github.com/rs/xhandler/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/rs/xhandler/LICENSE rename to vendor/github.com/rs/xhandler/LICENSE diff --git a/Godeps/_workspace/src/github.com/rs/xhandler/README.md b/vendor/github.com/rs/xhandler/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/rs/xhandler/README.md rename to vendor/github.com/rs/xhandler/README.md diff --git a/Godeps/_workspace/src/github.com/rs/xhandler/chain.go b/vendor/github.com/rs/xhandler/chain.go similarity index 100% rename from Godeps/_workspace/src/github.com/rs/xhandler/chain.go rename to vendor/github.com/rs/xhandler/chain.go diff --git a/Godeps/_workspace/src/github.com/rs/xhandler/middleware.go b/vendor/github.com/rs/xhandler/middleware.go similarity index 100% rename from Godeps/_workspace/src/github.com/rs/xhandler/middleware.go rename to vendor/github.com/rs/xhandler/middleware.go diff --git a/Godeps/_workspace/src/github.com/rs/xhandler/xhandler.go b/vendor/github.com/rs/xhandler/xhandler.go similarity index 100% rename from Godeps/_workspace/src/github.com/rs/xhandler/xhandler.go rename to vendor/github.com/rs/xhandler/xhandler.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/LICENSE b/vendor/github.com/syndtr/goleveldb/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/LICENSE rename to vendor/github.com/syndtr/goleveldb/LICENSE diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/batch.go b/vendor/github.com/syndtr/goleveldb/leveldb/batch.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/batch.go rename to vendor/github.com/syndtr/goleveldb/leveldb/batch.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/cache/cache.go b/vendor/github.com/syndtr/goleveldb/leveldb/cache/cache.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/cache/cache.go rename to vendor/github.com/syndtr/goleveldb/leveldb/cache/cache.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/cache/lru.go b/vendor/github.com/syndtr/goleveldb/leveldb/cache/lru.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/cache/lru.go rename to vendor/github.com/syndtr/goleveldb/leveldb/cache/lru.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/comparer.go b/vendor/github.com/syndtr/goleveldb/leveldb/comparer.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/comparer.go rename to vendor/github.com/syndtr/goleveldb/leveldb/comparer.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/comparer/bytes_comparer.go b/vendor/github.com/syndtr/goleveldb/leveldb/comparer/bytes_comparer.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/comparer/bytes_comparer.go rename to vendor/github.com/syndtr/goleveldb/leveldb/comparer/bytes_comparer.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/comparer/comparer.go b/vendor/github.com/syndtr/goleveldb/leveldb/comparer/comparer.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/comparer/comparer.go rename to vendor/github.com/syndtr/goleveldb/leveldb/comparer/comparer.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db.go b/vendor/github.com/syndtr/goleveldb/leveldb/db.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db.go rename to vendor/github.com/syndtr/goleveldb/leveldb/db.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_compaction.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_compaction.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_compaction.go rename to vendor/github.com/syndtr/goleveldb/leveldb/db_compaction.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_iter.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_iter.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_iter.go rename to vendor/github.com/syndtr/goleveldb/leveldb/db_iter.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_snapshot.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_snapshot.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_snapshot.go rename to vendor/github.com/syndtr/goleveldb/leveldb/db_snapshot.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_state.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_state.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_state.go rename to vendor/github.com/syndtr/goleveldb/leveldb/db_state.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_transaction.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_transaction.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_transaction.go rename to vendor/github.com/syndtr/goleveldb/leveldb/db_transaction.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_util.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_util.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_util.go rename to vendor/github.com/syndtr/goleveldb/leveldb/db_util.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_write.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go rename to vendor/github.com/syndtr/goleveldb/leveldb/db_write.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/doc.go b/vendor/github.com/syndtr/goleveldb/leveldb/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/doc.go rename to vendor/github.com/syndtr/goleveldb/leveldb/doc.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/errors.go b/vendor/github.com/syndtr/goleveldb/leveldb/errors.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/errors.go rename to vendor/github.com/syndtr/goleveldb/leveldb/errors.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/errors/errors.go b/vendor/github.com/syndtr/goleveldb/leveldb/errors/errors.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/errors/errors.go rename to vendor/github.com/syndtr/goleveldb/leveldb/errors/errors.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter.go b/vendor/github.com/syndtr/goleveldb/leveldb/filter.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter.go rename to vendor/github.com/syndtr/goleveldb/leveldb/filter.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter/bloom.go b/vendor/github.com/syndtr/goleveldb/leveldb/filter/bloom.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter/bloom.go rename to vendor/github.com/syndtr/goleveldb/leveldb/filter/bloom.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter/filter.go b/vendor/github.com/syndtr/goleveldb/leveldb/filter/filter.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter/filter.go rename to vendor/github.com/syndtr/goleveldb/leveldb/filter/filter.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/array_iter.go b/vendor/github.com/syndtr/goleveldb/leveldb/iterator/array_iter.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/array_iter.go rename to vendor/github.com/syndtr/goleveldb/leveldb/iterator/array_iter.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter.go b/vendor/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter.go rename to vendor/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/iter.go b/vendor/github.com/syndtr/goleveldb/leveldb/iterator/iter.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/iter.go rename to vendor/github.com/syndtr/goleveldb/leveldb/iterator/iter.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter.go b/vendor/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter.go rename to vendor/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/journal/journal.go b/vendor/github.com/syndtr/goleveldb/leveldb/journal/journal.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/journal/journal.go rename to vendor/github.com/syndtr/goleveldb/leveldb/journal/journal.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/key.go b/vendor/github.com/syndtr/goleveldb/leveldb/key.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/key.go rename to vendor/github.com/syndtr/goleveldb/leveldb/key.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb.go b/vendor/github.com/syndtr/goleveldb/leveldb/memdb/memdb.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb.go rename to vendor/github.com/syndtr/goleveldb/leveldb/memdb/memdb.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/opt/options.go b/vendor/github.com/syndtr/goleveldb/leveldb/opt/options.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/opt/options.go rename to vendor/github.com/syndtr/goleveldb/leveldb/opt/options.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/options.go b/vendor/github.com/syndtr/goleveldb/leveldb/options.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/options.go rename to vendor/github.com/syndtr/goleveldb/leveldb/options.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session.go b/vendor/github.com/syndtr/goleveldb/leveldb/session.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session.go rename to vendor/github.com/syndtr/goleveldb/leveldb/session.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_compaction.go b/vendor/github.com/syndtr/goleveldb/leveldb/session_compaction.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_compaction.go rename to vendor/github.com/syndtr/goleveldb/leveldb/session_compaction.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record.go b/vendor/github.com/syndtr/goleveldb/leveldb/session_record.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record.go rename to vendor/github.com/syndtr/goleveldb/leveldb/session_record.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_util.go b/vendor/github.com/syndtr/goleveldb/leveldb/session_util.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_util.go rename to vendor/github.com/syndtr/goleveldb/leveldb/session_util.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go rename to vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage_plan9.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_plan9.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage_plan9.go rename to vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_plan9.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage_solaris.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_solaris.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage_solaris.go rename to vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_solaris.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage_unix.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage_unix.go rename to vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_unix.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage_windows.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage_windows.go rename to vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_windows.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/mem_storage.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/mem_storage.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/mem_storage.go rename to vendor/github.com/syndtr/goleveldb/leveldb/storage/mem_storage.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/storage.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/storage.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/storage.go rename to vendor/github.com/syndtr/goleveldb/leveldb/storage/storage.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table.go b/vendor/github.com/syndtr/goleveldb/leveldb/table.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table.go rename to vendor/github.com/syndtr/goleveldb/leveldb/table.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/reader.go b/vendor/github.com/syndtr/goleveldb/leveldb/table/reader.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/reader.go rename to vendor/github.com/syndtr/goleveldb/leveldb/table/reader.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/table.go b/vendor/github.com/syndtr/goleveldb/leveldb/table/table.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/table.go rename to vendor/github.com/syndtr/goleveldb/leveldb/table/table.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/writer.go b/vendor/github.com/syndtr/goleveldb/leveldb/table/writer.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/writer.go rename to vendor/github.com/syndtr/goleveldb/leveldb/table/writer.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util.go b/vendor/github.com/syndtr/goleveldb/leveldb/util.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util.go rename to vendor/github.com/syndtr/goleveldb/leveldb/util.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/buffer.go b/vendor/github.com/syndtr/goleveldb/leveldb/util/buffer.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/buffer.go rename to vendor/github.com/syndtr/goleveldb/leveldb/util/buffer.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/buffer_pool.go b/vendor/github.com/syndtr/goleveldb/leveldb/util/buffer_pool.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/buffer_pool.go rename to vendor/github.com/syndtr/goleveldb/leveldb/util/buffer_pool.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/crc32.go b/vendor/github.com/syndtr/goleveldb/leveldb/util/crc32.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/crc32.go rename to vendor/github.com/syndtr/goleveldb/leveldb/util/crc32.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/hash.go b/vendor/github.com/syndtr/goleveldb/leveldb/util/hash.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/hash.go rename to vendor/github.com/syndtr/goleveldb/leveldb/util/hash.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/range.go b/vendor/github.com/syndtr/goleveldb/leveldb/util/range.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/range.go rename to vendor/github.com/syndtr/goleveldb/leveldb/util/range.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/util.go b/vendor/github.com/syndtr/goleveldb/leveldb/util/util.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/util.go rename to vendor/github.com/syndtr/goleveldb/leveldb/util/util.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/version.go b/vendor/github.com/syndtr/goleveldb/leveldb/version.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/version.go rename to vendor/github.com/syndtr/goleveldb/leveldb/version.go diff --git a/Godeps/_workspace/src/github.com/syndtr/gosnappy/LICENSE b/vendor/github.com/syndtr/gosnappy/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/gosnappy/LICENSE rename to vendor/github.com/syndtr/gosnappy/LICENSE 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/pbkdf2/pbkdf2.go b/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/pbkdf2/pbkdf2.go rename to vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ripemd160/ripemd160.go b/vendor/golang.org/x/crypto/ripemd160/ripemd160.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/ripemd160/ripemd160.go rename to vendor/golang.org/x/crypto/ripemd160/ripemd160.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ripemd160/ripemd160block.go b/vendor/golang.org/x/crypto/ripemd160/ripemd160block.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/ripemd160/ripemd160block.go rename to vendor/golang.org/x/crypto/ripemd160/ripemd160block.go diff --git a/Godeps/_workspace/src/golang.org/x/crypto/scrypt/scrypt.go b/vendor/golang.org/x/crypto/scrypt/scrypt.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/crypto/scrypt/scrypt.go rename to vendor/golang.org/x/crypto/scrypt/scrypt.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/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/html/atom/atom.go b/vendor/golang.org/x/net/html/atom/atom.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/html/atom/atom.go rename to vendor/golang.org/x/net/html/atom/atom.go diff --git a/Godeps/_workspace/src/golang.org/x/net/html/atom/gen.go b/vendor/golang.org/x/net/html/atom/gen.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/html/atom/gen.go rename to vendor/golang.org/x/net/html/atom/gen.go diff --git a/Godeps/_workspace/src/golang.org/x/net/html/atom/table.go b/vendor/golang.org/x/net/html/atom/table.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/html/atom/table.go rename to vendor/golang.org/x/net/html/atom/table.go diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go b/vendor/golang.org/x/net/html/charset/charset.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go rename to vendor/golang.org/x/net/html/charset/charset.go diff --git a/Godeps/_workspace/src/golang.org/x/net/html/const.go b/vendor/golang.org/x/net/html/const.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/html/const.go rename to vendor/golang.org/x/net/html/const.go diff --git a/Godeps/_workspace/src/golang.org/x/net/html/doc.go b/vendor/golang.org/x/net/html/doc.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/html/doc.go rename to vendor/golang.org/x/net/html/doc.go diff --git a/Godeps/_workspace/src/golang.org/x/net/html/doctype.go b/vendor/golang.org/x/net/html/doctype.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/html/doctype.go rename to vendor/golang.org/x/net/html/doctype.go diff --git a/Godeps/_workspace/src/golang.org/x/net/html/entity.go b/vendor/golang.org/x/net/html/entity.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/html/entity.go rename to vendor/golang.org/x/net/html/entity.go diff --git a/Godeps/_workspace/src/golang.org/x/net/html/escape.go b/vendor/golang.org/x/net/html/escape.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/html/escape.go rename to vendor/golang.org/x/net/html/escape.go diff --git a/Godeps/_workspace/src/golang.org/x/net/html/foreign.go b/vendor/golang.org/x/net/html/foreign.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/html/foreign.go rename to vendor/golang.org/x/net/html/foreign.go diff --git a/Godeps/_workspace/src/golang.org/x/net/html/node.go b/vendor/golang.org/x/net/html/node.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/html/node.go rename to vendor/golang.org/x/net/html/node.go diff --git a/Godeps/_workspace/src/golang.org/x/net/html/parse.go b/vendor/golang.org/x/net/html/parse.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/html/parse.go rename to vendor/golang.org/x/net/html/parse.go diff --git a/Godeps/_workspace/src/golang.org/x/net/html/render.go b/vendor/golang.org/x/net/html/render.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/html/render.go rename to vendor/golang.org/x/net/html/render.go diff --git a/Godeps/_workspace/src/golang.org/x/net/html/token.go b/vendor/golang.org/x/net/html/token.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/html/token.go rename to vendor/golang.org/x/net/html/token.go diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/client.go b/vendor/golang.org/x/net/websocket/client.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/websocket/client.go rename to vendor/golang.org/x/net/websocket/client.go diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/hybi.go b/vendor/golang.org/x/net/websocket/hybi.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/websocket/hybi.go rename to vendor/golang.org/x/net/websocket/hybi.go diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/server.go b/vendor/golang.org/x/net/websocket/server.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/websocket/server.go rename to vendor/golang.org/x/net/websocket/server.go diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/websocket.go b/vendor/golang.org/x/net/websocket/websocket.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/net/websocket/websocket.go rename to vendor/golang.org/x/net/websocket/websocket.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/LICENSE b/vendor/golang.org/x/sys/LICENSE similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/LICENSE rename to vendor/golang.org/x/sys/LICENSE diff --git a/Godeps/_workspace/src/golang.org/x/sys/PATENTS b/vendor/golang.org/x/sys/PATENTS similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/PATENTS rename to vendor/golang.org/x/sys/PATENTS diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/.gitignore b/vendor/golang.org/x/sys/unix/.gitignore similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/.gitignore rename to vendor/golang.org/x/sys/unix/.gitignore diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm.s b/vendor/golang.org/x/sys/unix/asm.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm.s rename to vendor/golang.org/x/sys/unix/asm.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_386.s b/vendor/golang.org/x/sys/unix/asm_darwin_386.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_386.s rename to vendor/golang.org/x/sys/unix/asm_darwin_386.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_amd64.s b/vendor/golang.org/x/sys/unix/asm_darwin_amd64.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_amd64.s rename to vendor/golang.org/x/sys/unix/asm_darwin_amd64.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm.s b/vendor/golang.org/x/sys/unix/asm_darwin_arm.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm.s rename to vendor/golang.org/x/sys/unix/asm_darwin_arm.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm64.s b/vendor/golang.org/x/sys/unix/asm_darwin_arm64.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm64.s rename to vendor/golang.org/x/sys/unix/asm_darwin_arm64.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_dragonfly_386.s b/vendor/golang.org/x/sys/unix/asm_dragonfly_386.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_dragonfly_386.s rename to vendor/golang.org/x/sys/unix/asm_dragonfly_386.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_dragonfly_amd64.s b/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_dragonfly_amd64.s rename to vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_386.s b/vendor/golang.org/x/sys/unix/asm_freebsd_386.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_386.s rename to vendor/golang.org/x/sys/unix/asm_freebsd_386.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_amd64.s b/vendor/golang.org/x/sys/unix/asm_freebsd_amd64.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_amd64.s rename to vendor/golang.org/x/sys/unix/asm_freebsd_amd64.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_arm.s b/vendor/golang.org/x/sys/unix/asm_freebsd_arm.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_arm.s rename to vendor/golang.org/x/sys/unix/asm_freebsd_arm.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_386.s b/vendor/golang.org/x/sys/unix/asm_linux_386.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_386.s rename to vendor/golang.org/x/sys/unix/asm_linux_386.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_amd64.s b/vendor/golang.org/x/sys/unix/asm_linux_amd64.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_amd64.s rename to vendor/golang.org/x/sys/unix/asm_linux_amd64.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm.s b/vendor/golang.org/x/sys/unix/asm_linux_arm.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm.s rename to vendor/golang.org/x/sys/unix/asm_linux_arm.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm64.s b/vendor/golang.org/x/sys/unix/asm_linux_arm64.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm64.s rename to vendor/golang.org/x/sys/unix/asm_linux_arm64.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_ppc64x.s b/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_ppc64x.s rename to vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_386.s b/vendor/golang.org/x/sys/unix/asm_netbsd_386.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_386.s rename to vendor/golang.org/x/sys/unix/asm_netbsd_386.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_amd64.s b/vendor/golang.org/x/sys/unix/asm_netbsd_amd64.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_amd64.s rename to vendor/golang.org/x/sys/unix/asm_netbsd_amd64.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_arm.s b/vendor/golang.org/x/sys/unix/asm_netbsd_arm.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_arm.s rename to vendor/golang.org/x/sys/unix/asm_netbsd_arm.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_openbsd_386.s b/vendor/golang.org/x/sys/unix/asm_openbsd_386.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_openbsd_386.s rename to vendor/golang.org/x/sys/unix/asm_openbsd_386.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_openbsd_amd64.s b/vendor/golang.org/x/sys/unix/asm_openbsd_amd64.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_openbsd_amd64.s rename to vendor/golang.org/x/sys/unix/asm_openbsd_amd64.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_solaris_amd64.s b/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_solaris_amd64.s rename to vendor/golang.org/x/sys/unix/asm_solaris_amd64.s diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/constants.go b/vendor/golang.org/x/sys/unix/constants.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/constants.go rename to vendor/golang.org/x/sys/unix/constants.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/env_unix.go b/vendor/golang.org/x/sys/unix/env_unix.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/env_unix.go rename to vendor/golang.org/x/sys/unix/env_unix.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/env_unset.go b/vendor/golang.org/x/sys/unix/env_unset.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/env_unset.go rename to vendor/golang.org/x/sys/unix/env_unset.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/flock.go b/vendor/golang.org/x/sys/unix/flock.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/flock.go rename to vendor/golang.org/x/sys/unix/flock.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/flock_linux_32bit.go b/vendor/golang.org/x/sys/unix/flock_linux_32bit.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/flock_linux_32bit.go rename to vendor/golang.org/x/sys/unix/flock_linux_32bit.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo.go b/vendor/golang.org/x/sys/unix/gccgo.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/gccgo.go rename to vendor/golang.org/x/sys/unix/gccgo.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_c.c b/vendor/golang.org/x/sys/unix/gccgo_c.c similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_c.c rename to vendor/golang.org/x/sys/unix/gccgo_c.c diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_linux_amd64.go b/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_linux_amd64.go rename to vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mkall.sh b/vendor/golang.org/x/sys/unix/mkall.sh similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/mkall.sh rename to vendor/golang.org/x/sys/unix/mkall.sh diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/mkerrors.sh rename to vendor/golang.org/x/sys/unix/mkerrors.sh diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall.pl b/vendor/golang.org/x/sys/unix/mksyscall.pl similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall.pl rename to vendor/golang.org/x/sys/unix/mksyscall.pl diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall_solaris.pl b/vendor/golang.org/x/sys/unix/mksyscall_solaris.pl similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall_solaris.pl rename to vendor/golang.org/x/sys/unix/mksyscall_solaris.pl diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysctl_openbsd.pl b/vendor/golang.org/x/sys/unix/mksysctl_openbsd.pl similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/mksysctl_openbsd.pl rename to vendor/golang.org/x/sys/unix/mksysctl_openbsd.pl diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_darwin.pl b/vendor/golang.org/x/sys/unix/mksysnum_darwin.pl similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_darwin.pl rename to vendor/golang.org/x/sys/unix/mksysnum_darwin.pl diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_dragonfly.pl b/vendor/golang.org/x/sys/unix/mksysnum_dragonfly.pl similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_dragonfly.pl rename to vendor/golang.org/x/sys/unix/mksysnum_dragonfly.pl diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_freebsd.pl b/vendor/golang.org/x/sys/unix/mksysnum_freebsd.pl similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_freebsd.pl rename to vendor/golang.org/x/sys/unix/mksysnum_freebsd.pl diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_linux.pl b/vendor/golang.org/x/sys/unix/mksysnum_linux.pl similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_linux.pl rename to vendor/golang.org/x/sys/unix/mksysnum_linux.pl diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_netbsd.pl b/vendor/golang.org/x/sys/unix/mksysnum_netbsd.pl similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_netbsd.pl rename to vendor/golang.org/x/sys/unix/mksysnum_netbsd.pl diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_openbsd.pl b/vendor/golang.org/x/sys/unix/mksysnum_openbsd.pl similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_openbsd.pl rename to vendor/golang.org/x/sys/unix/mksysnum_openbsd.pl diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/race.go b/vendor/golang.org/x/sys/unix/race.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/race.go rename to vendor/golang.org/x/sys/unix/race.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/race0.go b/vendor/golang.org/x/sys/unix/race0.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/race0.go rename to vendor/golang.org/x/sys/unix/race0.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_linux.go b/vendor/golang.org/x/sys/unix/sockcmsg_linux.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_linux.go rename to vendor/golang.org/x/sys/unix/sockcmsg_linux.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_unix.go b/vendor/golang.org/x/sys/unix/sockcmsg_unix.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_unix.go rename to vendor/golang.org/x/sys/unix/sockcmsg_unix.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/str.go b/vendor/golang.org/x/sys/unix/str.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/str.go rename to vendor/golang.org/x/sys/unix/str.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall.go b/vendor/golang.org/x/sys/unix/syscall.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall.go rename to vendor/golang.org/x/sys/unix/syscall.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd.go b/vendor/golang.org/x/sys/unix/syscall_bsd.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd.go rename to vendor/golang.org/x/sys/unix/syscall_bsd.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin.go rename to vendor/golang.org/x/sys/unix/syscall_darwin.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_386.go b/vendor/golang.org/x/sys/unix/syscall_darwin_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_386.go rename to vendor/golang.org/x/sys/unix/syscall_darwin_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_amd64.go rename to vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm.go b/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm.go rename to vendor/golang.org/x/sys/unix/syscall_darwin_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm64.go rename to vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly.go rename to vendor/golang.org/x/sys/unix/syscall_dragonfly.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly_386.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly_386.go rename to vendor/golang.org/x/sys/unix/syscall_dragonfly_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly_amd64.go rename to vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd.go b/vendor/golang.org/x/sys/unix/syscall_freebsd.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd.go rename to vendor/golang.org/x/sys/unix/syscall_freebsd.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_386.go rename to vendor/golang.org/x/sys/unix/syscall_freebsd_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_amd64.go rename to vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_arm.go rename to vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux.go rename to vendor/golang.org/x/sys/unix/syscall_linux.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_386.go b/vendor/golang.org/x/sys/unix/syscall_linux_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_386.go rename to vendor/golang.org/x/sys/unix/syscall_linux_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_amd64.go rename to vendor/golang.org/x/sys/unix/syscall_linux_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm.go rename to vendor/golang.org/x/sys/unix/syscall_linux_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm64.go rename to vendor/golang.org/x/sys/unix/syscall_linux_arm64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_ppc64x.go rename to vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/golang.org/x/sys/unix/syscall_netbsd.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd.go rename to vendor/golang.org/x/sys/unix/syscall_netbsd.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_386.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_386.go rename to vendor/golang.org/x/sys/unix/syscall_netbsd_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_amd64.go rename to vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_arm.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_arm.go rename to vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_no_getwd.go b/vendor/golang.org/x/sys/unix/syscall_no_getwd.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_no_getwd.go rename to vendor/golang.org/x/sys/unix/syscall_no_getwd.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/golang.org/x/sys/unix/syscall_openbsd.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd.go rename to vendor/golang.org/x/sys/unix/syscall_openbsd.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_386.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_386.go rename to vendor/golang.org/x/sys/unix/syscall_openbsd_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_amd64.go rename to vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris.go b/vendor/golang.org/x/sys/unix/syscall_solaris.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris.go rename to vendor/golang.org/x/sys/unix/syscall_solaris.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris_amd64.go b/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris_amd64.go rename to vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_unix.go b/vendor/golang.org/x/sys/unix/syscall_unix.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_unix.go rename to vendor/golang.org/x/sys/unix/syscall_unix.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_darwin.go b/vendor/golang.org/x/sys/unix/types_darwin.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/types_darwin.go rename to vendor/golang.org/x/sys/unix/types_darwin.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_dragonfly.go b/vendor/golang.org/x/sys/unix/types_dragonfly.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/types_dragonfly.go rename to vendor/golang.org/x/sys/unix/types_dragonfly.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_freebsd.go b/vendor/golang.org/x/sys/unix/types_freebsd.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/types_freebsd.go rename to vendor/golang.org/x/sys/unix/types_freebsd.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go b/vendor/golang.org/x/sys/unix/types_linux.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go rename to vendor/golang.org/x/sys/unix/types_linux.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_netbsd.go b/vendor/golang.org/x/sys/unix/types_netbsd.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/types_netbsd.go rename to vendor/golang.org/x/sys/unix/types_netbsd.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_openbsd.go b/vendor/golang.org/x/sys/unix/types_openbsd.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/types_openbsd.go rename to vendor/golang.org/x/sys/unix/types_openbsd.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_solaris.go b/vendor/golang.org/x/sys/unix/types_solaris.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/types_solaris.go rename to vendor/golang.org/x/sys/unix/types_solaris.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_386.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_386.go rename to vendor/golang.org/x/sys/unix/zerrors_darwin_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_amd64.go rename to vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm.go rename to vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm64.go rename to vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_dragonfly_386.go b/vendor/golang.org/x/sys/unix/zerrors_dragonfly_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_dragonfly_386.go rename to vendor/golang.org/x/sys/unix/zerrors_dragonfly_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go rename to vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_386.go rename to vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_amd64.go rename to vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_arm.go rename to vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_386.go rename to vendor/golang.org/x/sys/unix/zerrors_linux_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_amd64.go rename to vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm.go rename to vendor/golang.org/x/sys/unix/zerrors_linux_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm64.go rename to vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64.go rename to vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64le.go rename to vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_386.go rename to vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_amd64.go rename to vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_arm.go rename to vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_386.go rename to vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_amd64.go rename to vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_solaris_amd64.go rename to vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_386.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_386.go rename to vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_amd64.go rename to vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm.go rename to vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm64.go rename to vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_dragonfly_386.go b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_dragonfly_386.go rename to vendor/golang.org/x/sys/unix/zsyscall_dragonfly_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go rename to vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_386.go rename to vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go rename to vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_arm.go rename to vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_386.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_386.go rename to vendor/golang.org/x/sys/unix/zsyscall_linux_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_amd64.go rename to vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm.go rename to vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm64.go rename to vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64.go rename to vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go rename to vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_386.go rename to vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go rename to vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_arm.go rename to vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_386.go rename to vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go rename to vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_solaris_amd64.go rename to vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysctl_openbsd.go b/vendor/golang.org/x/sys/unix/zsysctl_openbsd.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysctl_openbsd.go rename to vendor/golang.org/x/sys/unix/zsysctl_openbsd.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_386.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_386.go rename to vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_amd64.go rename to vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm.go rename to vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm64.go rename to vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_386.go b/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_386.go rename to vendor/golang.org/x/sys/unix/zsysnum_dragonfly_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go rename to vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_386.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_386.go rename to vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go rename to vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_arm.go rename to vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_386.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_386.go rename to vendor/golang.org/x/sys/unix/zsysnum_linux_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_amd64.go rename to vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm.go rename to vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm64.go rename to vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64.go rename to vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go rename to vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_386.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_386.go rename to vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go rename to vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_arm.go rename to vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_386.go rename to vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go rename to vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_solaris_amd64.go rename to vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_386.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_386.go rename to vendor/golang.org/x/sys/unix/ztypes_darwin_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_amd64.go rename to vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm.go rename to vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm64.go rename to vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_dragonfly_386.go b/vendor/golang.org/x/sys/unix/ztypes_dragonfly_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_dragonfly_386.go rename to vendor/golang.org/x/sys/unix/ztypes_dragonfly_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go rename to vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_386.go rename to vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_amd64.go rename to vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_arm.go rename to vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_386.go b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_386.go rename to vendor/golang.org/x/sys/unix/ztypes_linux_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_amd64.go rename to vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm.go rename to vendor/golang.org/x/sys/unix/ztypes_linux_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm64.go rename to vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64.go rename to vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64le.go rename to vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_386.go rename to vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_amd64.go rename to vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_arm.go rename to vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_386.go rename to vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_amd64.go rename to vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_solaris_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_solaris_amd64.go rename to vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go diff --git a/Godeps/_workspace/src/golang.org/x/text/LICENSE b/vendor/golang.org/x/text/LICENSE similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/LICENSE rename to vendor/golang.org/x/text/LICENSE diff --git a/Godeps/_workspace/src/golang.org/x/text/PATENTS b/vendor/golang.org/x/text/PATENTS similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/PATENTS rename to vendor/golang.org/x/text/PATENTS diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/charmap/charmap.go b/vendor/golang.org/x/text/encoding/charmap/charmap.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/charmap/charmap.go rename to vendor/golang.org/x/text/encoding/charmap/charmap.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/charmap/maketables.go b/vendor/golang.org/x/text/encoding/charmap/maketables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/charmap/maketables.go rename to vendor/golang.org/x/text/encoding/charmap/maketables.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/charmap/tables.go b/vendor/golang.org/x/text/encoding/charmap/tables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/charmap/tables.go rename to vendor/golang.org/x/text/encoding/charmap/tables.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/encoding.go b/vendor/golang.org/x/text/encoding/encoding.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/encoding.go rename to vendor/golang.org/x/text/encoding/encoding.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/htmlindex/gen.go b/vendor/golang.org/x/text/encoding/htmlindex/gen.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/htmlindex/gen.go rename to vendor/golang.org/x/text/encoding/htmlindex/gen.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/htmlindex/htmlindex.go b/vendor/golang.org/x/text/encoding/htmlindex/htmlindex.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/htmlindex/htmlindex.go rename to vendor/golang.org/x/text/encoding/htmlindex/htmlindex.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/htmlindex/map.go b/vendor/golang.org/x/text/encoding/htmlindex/map.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/htmlindex/map.go rename to vendor/golang.org/x/text/encoding/htmlindex/map.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/htmlindex/tables.go b/vendor/golang.org/x/text/encoding/htmlindex/tables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/htmlindex/tables.go rename to vendor/golang.org/x/text/encoding/htmlindex/tables.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/ianaindex/ianaindex.go b/vendor/golang.org/x/text/encoding/ianaindex/ianaindex.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/ianaindex/ianaindex.go rename to vendor/golang.org/x/text/encoding/ianaindex/ianaindex.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/internal/identifier/gen.go b/vendor/golang.org/x/text/encoding/internal/identifier/gen.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/internal/identifier/gen.go rename to vendor/golang.org/x/text/encoding/internal/identifier/gen.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/internal/identifier/identifier.go b/vendor/golang.org/x/text/encoding/internal/identifier/identifier.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/internal/identifier/identifier.go rename to vendor/golang.org/x/text/encoding/internal/identifier/identifier.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/internal/identifier/mib.go b/vendor/golang.org/x/text/encoding/internal/identifier/mib.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/internal/identifier/mib.go rename to vendor/golang.org/x/text/encoding/internal/identifier/mib.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/internal/internal.go b/vendor/golang.org/x/text/encoding/internal/internal.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/internal/internal.go rename to vendor/golang.org/x/text/encoding/internal/internal.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/japanese/all.go b/vendor/golang.org/x/text/encoding/japanese/all.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/japanese/all.go rename to vendor/golang.org/x/text/encoding/japanese/all.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/japanese/eucjp.go b/vendor/golang.org/x/text/encoding/japanese/eucjp.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/japanese/eucjp.go rename to vendor/golang.org/x/text/encoding/japanese/eucjp.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/japanese/iso2022jp.go b/vendor/golang.org/x/text/encoding/japanese/iso2022jp.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/japanese/iso2022jp.go rename to vendor/golang.org/x/text/encoding/japanese/iso2022jp.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/japanese/maketables.go b/vendor/golang.org/x/text/encoding/japanese/maketables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/japanese/maketables.go rename to vendor/golang.org/x/text/encoding/japanese/maketables.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/japanese/shiftjis.go b/vendor/golang.org/x/text/encoding/japanese/shiftjis.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/japanese/shiftjis.go rename to vendor/golang.org/x/text/encoding/japanese/shiftjis.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/japanese/tables.go b/vendor/golang.org/x/text/encoding/japanese/tables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/japanese/tables.go rename to vendor/golang.org/x/text/encoding/japanese/tables.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/korean/euckr.go b/vendor/golang.org/x/text/encoding/korean/euckr.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/korean/euckr.go rename to vendor/golang.org/x/text/encoding/korean/euckr.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/korean/maketables.go b/vendor/golang.org/x/text/encoding/korean/maketables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/korean/maketables.go rename to vendor/golang.org/x/text/encoding/korean/maketables.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/korean/tables.go b/vendor/golang.org/x/text/encoding/korean/tables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/korean/tables.go rename to vendor/golang.org/x/text/encoding/korean/tables.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/simplifiedchinese/all.go b/vendor/golang.org/x/text/encoding/simplifiedchinese/all.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/simplifiedchinese/all.go rename to vendor/golang.org/x/text/encoding/simplifiedchinese/all.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/simplifiedchinese/gbk.go b/vendor/golang.org/x/text/encoding/simplifiedchinese/gbk.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/simplifiedchinese/gbk.go rename to vendor/golang.org/x/text/encoding/simplifiedchinese/gbk.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go b/vendor/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go rename to vendor/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/simplifiedchinese/maketables.go b/vendor/golang.org/x/text/encoding/simplifiedchinese/maketables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/simplifiedchinese/maketables.go rename to vendor/golang.org/x/text/encoding/simplifiedchinese/maketables.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/simplifiedchinese/tables.go b/vendor/golang.org/x/text/encoding/simplifiedchinese/tables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/simplifiedchinese/tables.go rename to vendor/golang.org/x/text/encoding/simplifiedchinese/tables.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/traditionalchinese/big5.go b/vendor/golang.org/x/text/encoding/traditionalchinese/big5.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/traditionalchinese/big5.go rename to vendor/golang.org/x/text/encoding/traditionalchinese/big5.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/traditionalchinese/maketables.go b/vendor/golang.org/x/text/encoding/traditionalchinese/maketables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/traditionalchinese/maketables.go rename to vendor/golang.org/x/text/encoding/traditionalchinese/maketables.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/traditionalchinese/tables.go b/vendor/golang.org/x/text/encoding/traditionalchinese/tables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/traditionalchinese/tables.go rename to vendor/golang.org/x/text/encoding/traditionalchinese/tables.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/unicode/override.go b/vendor/golang.org/x/text/encoding/unicode/override.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/unicode/override.go rename to vendor/golang.org/x/text/encoding/unicode/override.go diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/unicode/unicode.go b/vendor/golang.org/x/text/encoding/unicode/unicode.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/encoding/unicode/unicode.go rename to vendor/golang.org/x/text/encoding/unicode/unicode.go diff --git a/Godeps/_workspace/src/golang.org/x/text/internal/tag/tag.go b/vendor/golang.org/x/text/internal/tag/tag.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/internal/tag/tag.go rename to vendor/golang.org/x/text/internal/tag/tag.go diff --git a/Godeps/_workspace/src/golang.org/x/text/internal/utf8internal/utf8internal.go b/vendor/golang.org/x/text/internal/utf8internal/utf8internal.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/internal/utf8internal/utf8internal.go rename to vendor/golang.org/x/text/internal/utf8internal/utf8internal.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/Makefile b/vendor/golang.org/x/text/language/Makefile similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/Makefile rename to vendor/golang.org/x/text/language/Makefile diff --git a/Godeps/_workspace/src/golang.org/x/text/language/common.go b/vendor/golang.org/x/text/language/common.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/common.go rename to vendor/golang.org/x/text/language/common.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/coverage.go b/vendor/golang.org/x/text/language/coverage.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/coverage.go rename to vendor/golang.org/x/text/language/coverage.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/display/dict.go b/vendor/golang.org/x/text/language/display/dict.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/display/dict.go rename to vendor/golang.org/x/text/language/display/dict.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/display/display.go b/vendor/golang.org/x/text/language/display/display.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/display/display.go rename to vendor/golang.org/x/text/language/display/display.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/display/lookup.go b/vendor/golang.org/x/text/language/display/lookup.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/display/lookup.go rename to vendor/golang.org/x/text/language/display/lookup.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/display/maketables.go b/vendor/golang.org/x/text/language/display/maketables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/display/maketables.go rename to vendor/golang.org/x/text/language/display/maketables.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/display/tables.go b/vendor/golang.org/x/text/language/display/tables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/display/tables.go rename to vendor/golang.org/x/text/language/display/tables.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/gen_common.go b/vendor/golang.org/x/text/language/gen_common.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/gen_common.go rename to vendor/golang.org/x/text/language/gen_common.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/gen_index.go b/vendor/golang.org/x/text/language/gen_index.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/gen_index.go rename to vendor/golang.org/x/text/language/gen_index.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/go1_1.go b/vendor/golang.org/x/text/language/go1_1.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/go1_1.go rename to vendor/golang.org/x/text/language/go1_1.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/go1_2.go b/vendor/golang.org/x/text/language/go1_2.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/go1_2.go rename to vendor/golang.org/x/text/language/go1_2.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/index.go b/vendor/golang.org/x/text/language/index.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/index.go rename to vendor/golang.org/x/text/language/index.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/language.go b/vendor/golang.org/x/text/language/language.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/language.go rename to vendor/golang.org/x/text/language/language.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/lookup.go b/vendor/golang.org/x/text/language/lookup.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/lookup.go rename to vendor/golang.org/x/text/language/lookup.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/maketables.go b/vendor/golang.org/x/text/language/maketables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/maketables.go rename to vendor/golang.org/x/text/language/maketables.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/match.go b/vendor/golang.org/x/text/language/match.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/match.go rename to vendor/golang.org/x/text/language/match.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/parse.go b/vendor/golang.org/x/text/language/parse.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/parse.go rename to vendor/golang.org/x/text/language/parse.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/tables.go b/vendor/golang.org/x/text/language/tables.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/tables.go rename to vendor/golang.org/x/text/language/tables.go diff --git a/Godeps/_workspace/src/golang.org/x/text/language/tags.go b/vendor/golang.org/x/text/language/tags.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/language/tags.go rename to vendor/golang.org/x/text/language/tags.go diff --git a/Godeps/_workspace/src/golang.org/x/text/runes/cond.go b/vendor/golang.org/x/text/runes/cond.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/runes/cond.go rename to vendor/golang.org/x/text/runes/cond.go diff --git a/Godeps/_workspace/src/golang.org/x/text/runes/runes.go b/vendor/golang.org/x/text/runes/runes.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/runes/runes.go rename to vendor/golang.org/x/text/runes/runes.go diff --git a/Godeps/_workspace/src/golang.org/x/text/transform/transform.go b/vendor/golang.org/x/text/transform/transform.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/text/transform/transform.go rename to vendor/golang.org/x/text/transform/transform.go diff --git a/Godeps/_workspace/src/golang.org/x/tools/LICENSE b/vendor/golang.org/x/tools/LICENSE similarity index 100% rename from Godeps/_workspace/src/golang.org/x/tools/LICENSE rename to vendor/golang.org/x/tools/LICENSE diff --git a/Godeps/_workspace/src/golang.org/x/tools/PATENTS b/vendor/golang.org/x/tools/PATENTS similarity index 100% rename from Godeps/_workspace/src/golang.org/x/tools/PATENTS rename to vendor/golang.org/x/tools/PATENTS diff --git a/Godeps/_workspace/src/golang.org/x/tools/go/ast/astutil/enclosing.go b/vendor/golang.org/x/tools/go/ast/astutil/enclosing.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/tools/go/ast/astutil/enclosing.go rename to vendor/golang.org/x/tools/go/ast/astutil/enclosing.go diff --git a/Godeps/_workspace/src/golang.org/x/tools/go/ast/astutil/imports.go b/vendor/golang.org/x/tools/go/ast/astutil/imports.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/tools/go/ast/astutil/imports.go rename to vendor/golang.org/x/tools/go/ast/astutil/imports.go diff --git a/Godeps/_workspace/src/golang.org/x/tools/go/ast/astutil/util.go b/vendor/golang.org/x/tools/go/ast/astutil/util.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/tools/go/ast/astutil/util.go rename to vendor/golang.org/x/tools/go/ast/astutil/util.go diff --git a/Godeps/_workspace/src/golang.org/x/tools/imports/fix.go b/vendor/golang.org/x/tools/imports/fix.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/tools/imports/fix.go rename to vendor/golang.org/x/tools/imports/fix.go diff --git a/Godeps/_workspace/src/golang.org/x/tools/imports/imports.go b/vendor/golang.org/x/tools/imports/imports.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/tools/imports/imports.go rename to vendor/golang.org/x/tools/imports/imports.go diff --git a/Godeps/_workspace/src/golang.org/x/tools/imports/mkindex.go b/vendor/golang.org/x/tools/imports/mkindex.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/tools/imports/mkindex.go rename to vendor/golang.org/x/tools/imports/mkindex.go diff --git a/Godeps/_workspace/src/golang.org/x/tools/imports/mkstdlib.go b/vendor/golang.org/x/tools/imports/mkstdlib.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/tools/imports/mkstdlib.go rename to vendor/golang.org/x/tools/imports/mkstdlib.go diff --git a/Godeps/_workspace/src/golang.org/x/tools/imports/sortimports.go b/vendor/golang.org/x/tools/imports/sortimports.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/tools/imports/sortimports.go rename to vendor/golang.org/x/tools/imports/sortimports.go diff --git a/Godeps/_workspace/src/golang.org/x/tools/imports/zstdlib.go b/vendor/golang.org/x/tools/imports/zstdlib.go similarity index 100% rename from Godeps/_workspace/src/golang.org/x/tools/imports/zstdlib.go rename to vendor/golang.org/x/tools/imports/zstdlib.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/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/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/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/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/reporter.go b/vendor/gopkg.in/check.v1/reporter.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/check.v1/reporter.go rename to vendor/gopkg.in/check.v1/reporter.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/fatih/set.v0/.travis.yml b/vendor/gopkg.in/fatih/set.v0/.travis.yml similarity index 100% rename from Godeps/_workspace/src/gopkg.in/fatih/set.v0/.travis.yml rename to vendor/gopkg.in/fatih/set.v0/.travis.yml diff --git a/Godeps/_workspace/src/gopkg.in/fatih/set.v0/LICENSE.md b/vendor/gopkg.in/fatih/set.v0/LICENSE.md similarity index 100% rename from Godeps/_workspace/src/gopkg.in/fatih/set.v0/LICENSE.md rename to vendor/gopkg.in/fatih/set.v0/LICENSE.md diff --git a/Godeps/_workspace/src/gopkg.in/fatih/set.v0/README.md b/vendor/gopkg.in/fatih/set.v0/README.md similarity index 100% rename from Godeps/_workspace/src/gopkg.in/fatih/set.v0/README.md rename to vendor/gopkg.in/fatih/set.v0/README.md diff --git a/Godeps/_workspace/src/gopkg.in/fatih/set.v0/set.go b/vendor/gopkg.in/fatih/set.v0/set.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/fatih/set.v0/set.go rename to vendor/gopkg.in/fatih/set.v0/set.go diff --git a/Godeps/_workspace/src/gopkg.in/fatih/set.v0/set_nots.go b/vendor/gopkg.in/fatih/set.v0/set_nots.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/fatih/set.v0/set_nots.go rename to vendor/gopkg.in/fatih/set.v0/set_nots.go diff --git a/Godeps/_workspace/src/gopkg.in/fatih/set.v0/set_ts.go b/vendor/gopkg.in/fatih/set.v0/set_ts.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/fatih/set.v0/set_ts.go rename to vendor/gopkg.in/fatih/set.v0/set_ts.go diff --git a/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/LICENSE b/vendor/gopkg.in/karalabe/cookiejar.v2/LICENSE similarity index 100% rename from Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/LICENSE rename to vendor/gopkg.in/karalabe/cookiejar.v2/LICENSE diff --git a/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/prque.go b/vendor/gopkg.in/karalabe/cookiejar.v2/collections/prque/prque.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/prque.go rename to vendor/gopkg.in/karalabe/cookiejar.v2/collections/prque/prque.go diff --git a/Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/sstack.go b/vendor/gopkg.in/karalabe/cookiejar.v2/collections/prque/sstack.go similarity index 100% rename from Godeps/_workspace/src/gopkg.in/karalabe/cookiejar.v2/collections/prque/sstack.go rename to vendor/gopkg.in/karalabe/cookiejar.v2/collections/prque/sstack.go