diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 7711e9cf0d..4801523eeb 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -49,8 +49,8 @@
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema",
-			"Comment": "v0.7.4-6-g5d54e27",
-			"Rev": "5d54e27f1764a0309eafe12c9df7bac03f241646"
+			"Comment": "v0.7.4-43-gd22f52b",
+			"Rev": "d22f52bfeba06614d37c7aa1ad6fd76d8fdb2ba8"
 		},
 		{
 			"ImportPath": "github.com/armon/go-metrics",
@@ -140,10 +140,6 @@
 			"Comment": "v1.1.0-65-gee4a088",
 			"Rev": "ee4a0888a9abe7eefe5a0992ca4cb06864839873"
 		},
-		{
-			"ImportPath": "github.com/camlistore/go4/errorutil",
-			"Rev": "3b6feb5cf32f573fb124905de36a54c24ee14ac1"
-		},
 		{
 			"ImportPath": "github.com/codegangsta/negroni",
 			"Comment": "v0.1-62-g8d75e11",
@@ -1040,6 +1036,10 @@
 			"Comment": "v1.0-13-g5292687",
 			"Rev": "5292687f5379e01054407da44d7c4590a61fd3de"
 		},
+		{
+			"ImportPath": "go4.org/errorutil",
+			"Rev": "03efcb870d84809319ea509714dd6d19a1498483"
+		},
 		{
 			"ImportPath": "golang.org/x/crypto/bcrypt",
 			"Rev": "c84e1f8e3a7e322d497cd16c0e8a13c7e127baf3"
@@ -1139,7 +1139,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/heapster/metrics/api/v1/types",
-			"Comment": "v1.1.0-beta1",
+			"Comment": "v1.1.0-beta1-15-gde510e4",
 			"Rev": "de510e4bdcdea96722b5bde19ff0b7a142939485"
 		},
 		{
diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore
deleted file mode 100644
index f037d684ef..0000000000
--- a/Godeps/_workspace/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/pkg
-/bin
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/common/NOTICE b/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/common/NOTICE
deleted file mode 100644
index 636a2c1a5e..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/common/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Common libraries shared by Prometheus Go components.
-Copyright 2015 The Prometheus Authors
-
-This product includes software developed at
-SoundCloud Ltd. (http://soundcloud.com/).
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/NOTICE b/Godeps/_workspace/src/github.com/coreos/pkg/NOTICE
deleted file mode 100644
index b39ddfa5cb..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/pkg/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-CoreOS Project
-Copyright 2014 CoreOS, Inc
-
-This product includes software developed at CoreOS, Inc.
-(http://www.coreos.com/).
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/bugsnag/osext/LICENSE b/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/bugsnag/osext/LICENSE
deleted file mode 100644
index 18527a28fb..0000000000
--- a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/bugsnag/osext/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2012 Daniel Theophanes
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-   distribution.
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/docker/goamz/LICENSE b/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/docker/goamz/LICENSE
deleted file mode 100644
index 53320c352b..0000000000
--- a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/docker/goamz/LICENSE
+++ /dev/null
@@ -1,185 +0,0 @@
-This software is licensed under the LGPLv3, included below.
-
-As a special exception to the GNU Lesser General Public License version 3
-("LGPL3"), the copyright holders of this Library give you permission to
-convey to a third party a Combined Work that links statically or dynamically
-to this Library without providing any Minimal Corresponding Source or
-Minimal Application Code as set out in 4d or providing the installation
-information set out in section 4e, provided that you comply with the other
-provisions of LGPL3 and provided that you meet, for the Application the
-terms and conditions of the license(s) which apply to the Application.
-
-Except as stated in this special exception, the provisions of LGPL3 will
-continue to comply in full to this Library. If you modify this Library, you
-may apply this exception to your version of this Library, but you are not
-obliged to do so. If you do not wish to do so, delete this exception
-statement from your version. This exception does not (and cannot) modify any
-license terms which apply to the Application, with which you must still
-comply.
-
-
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/yvasiyarov/go-metrics/LICENSE b/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/yvasiyarov/go-metrics/LICENSE
deleted file mode 100644
index 363fa9ee77..0000000000
--- a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/yvasiyarov/go-metrics/LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright 2012 Richard Crowley. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    1.  Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-
-    2.  Redistributions in binary form must reproduce the above
-        copyright notice, this list of conditions and the following
-        disclaimer in the documentation and/or other materials provided
-        with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY RICHARD CROWLEY ``AS IS'' AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL RICHARD CROWLEY OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-
-The views and conclusions contained in the software and documentation
-are those of the authors and should not be interpreted as representing
-official policies, either expressed or implied, of Richard Crowley.
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/BurntSushi/toml/COPYING b/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/BurntSushi/toml/COPYING
deleted file mode 100644
index 5a8e332545..0000000000
--- a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/BurntSushi/toml/COPYING
+++ /dev/null
@@ -1,14 +0,0 @@
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
-
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.
-
diff --git a/Godeps/_workspace/src/github.com/kr/pty/License b/Godeps/_workspace/src/github.com/kr/pty/License
deleted file mode 100644
index 6b7558b6b4..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/License
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2011 Keith Rarick
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall
-be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
-OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE.libyaml b/Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE.libyaml
deleted file mode 100644
index 8da58fbf6f..0000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE.libyaml
+++ /dev/null
@@ -1,31 +0,0 @@
-The following files were ported to Go from C files of libyaml, and thus
-are still covered by their original copyright and license:
-
-    apic.go
-    emitterc.go
-    parserc.go
-    readerc.go
-    scannerc.go
-    writerc.go
-    yamlh.go
-    yamlprivateh.go
-
-Copyright (c) 2006 Kirill Simonov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/.gitignore b/vendor/bitbucket.org/bertimus9/systemstat/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/.gitignore
rename to vendor/bitbucket.org/bertimus9/systemstat/.gitignore
diff --git a/Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/AUTHORS b/vendor/bitbucket.org/bertimus9/systemstat/AUTHORS
similarity index 100%
rename from Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/AUTHORS
rename to vendor/bitbucket.org/bertimus9/systemstat/AUTHORS
diff --git a/Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/LICENSE b/vendor/bitbucket.org/bertimus9/systemstat/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/LICENSE
rename to vendor/bitbucket.org/bertimus9/systemstat/LICENSE
diff --git a/Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/Makefile b/vendor/bitbucket.org/bertimus9/systemstat/Makefile
similarity index 100%
rename from Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/Makefile
rename to vendor/bitbucket.org/bertimus9/systemstat/Makefile
diff --git a/Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/README.md b/vendor/bitbucket.org/bertimus9/systemstat/README.md
similarity index 100%
rename from Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/README.md
rename to vendor/bitbucket.org/bertimus9/systemstat/README.md
diff --git a/Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/VERSION b/vendor/bitbucket.org/bertimus9/systemstat/VERSION
similarity index 100%
rename from Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/VERSION
rename to vendor/bitbucket.org/bertimus9/systemstat/VERSION
diff --git a/Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/examples/go-top.go b/vendor/bitbucket.org/bertimus9/systemstat/examples/go-top.go
similarity index 100%
rename from Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/examples/go-top.go
rename to vendor/bitbucket.org/bertimus9/systemstat/examples/go-top.go
diff --git a/Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/systemstat.go b/vendor/bitbucket.org/bertimus9/systemstat/systemstat.go
similarity index 100%
rename from Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/systemstat.go
rename to vendor/bitbucket.org/bertimus9/systemstat/systemstat.go
diff --git a/Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/systemstat_linux.go b/vendor/bitbucket.org/bertimus9/systemstat/systemstat_linux.go
similarity index 100%
rename from Godeps/_workspace/src/bitbucket.org/bertimus9/systemstat/systemstat_linux.go
rename to vendor/bitbucket.org/bertimus9/systemstat/systemstat_linux.go
diff --git a/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/Makefile b/vendor/bitbucket.org/ww/goautoneg/Makefile
similarity index 100%
rename from Godeps/_workspace/src/bitbucket.org/ww/goautoneg/Makefile
rename to vendor/bitbucket.org/ww/goautoneg/Makefile
diff --git a/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/README.txt b/vendor/bitbucket.org/ww/goautoneg/README.txt
similarity index 100%
rename from Godeps/_workspace/src/bitbucket.org/ww/goautoneg/README.txt
rename to vendor/bitbucket.org/ww/goautoneg/README.txt
diff --git a/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/autoneg.go b/vendor/bitbucket.org/ww/goautoneg/autoneg.go
similarity index 100%
rename from Godeps/_workspace/src/bitbucket.org/ww/goautoneg/autoneg.go
rename to vendor/bitbucket.org/ww/goautoneg/autoneg.go
diff --git a/Godeps/_workspace/src/github.com/ClusterHQ/flocker-go/LICENSE b/vendor/github.com/ClusterHQ/flocker-go/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/ClusterHQ/flocker-go/LICENSE
rename to vendor/github.com/ClusterHQ/flocker-go/LICENSE
diff --git a/Godeps/_workspace/src/github.com/ClusterHQ/flocker-go/README.md b/vendor/github.com/ClusterHQ/flocker-go/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/ClusterHQ/flocker-go/README.md
rename to vendor/github.com/ClusterHQ/flocker-go/README.md
diff --git a/Godeps/_workspace/src/github.com/ClusterHQ/flocker-go/client.go b/vendor/github.com/ClusterHQ/flocker-go/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ClusterHQ/flocker-go/client.go
rename to vendor/github.com/ClusterHQ/flocker-go/client.go
diff --git a/Godeps/_workspace/src/github.com/ClusterHQ/flocker-go/doc.go b/vendor/github.com/ClusterHQ/flocker-go/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ClusterHQ/flocker-go/doc.go
rename to vendor/github.com/ClusterHQ/flocker-go/doc.go
diff --git a/Godeps/_workspace/src/github.com/ClusterHQ/flocker-go/util.go b/vendor/github.com/ClusterHQ/flocker-go/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ClusterHQ/flocker-go/util.go
rename to vendor/github.com/ClusterHQ/flocker-go/util.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/archive/tar/LICENSE b/vendor/github.com/Microsoft/go-winio/archive/tar/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/archive/tar/LICENSE
rename to vendor/github.com/Microsoft/go-winio/archive/tar/LICENSE
diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/archive/tar/common.go b/vendor/github.com/Microsoft/go-winio/archive/tar/common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/archive/tar/common.go
rename to vendor/github.com/Microsoft/go-winio/archive/tar/common.go
diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/archive/tar/reader.go b/vendor/github.com/Microsoft/go-winio/archive/tar/reader.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/archive/tar/reader.go
rename to vendor/github.com/Microsoft/go-winio/archive/tar/reader.go
diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/archive/tar/stat_atim.go b/vendor/github.com/Microsoft/go-winio/archive/tar/stat_atim.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/archive/tar/stat_atim.go
rename to vendor/github.com/Microsoft/go-winio/archive/tar/stat_atim.go
diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/archive/tar/stat_atimespec.go b/vendor/github.com/Microsoft/go-winio/archive/tar/stat_atimespec.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/archive/tar/stat_atimespec.go
rename to vendor/github.com/Microsoft/go-winio/archive/tar/stat_atimespec.go
diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/archive/tar/stat_unix.go b/vendor/github.com/Microsoft/go-winio/archive/tar/stat_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/archive/tar/stat_unix.go
rename to vendor/github.com/Microsoft/go-winio/archive/tar/stat_unix.go
diff --git a/Godeps/_workspace/src/github.com/Microsoft/go-winio/archive/tar/writer.go b/vendor/github.com/Microsoft/go-winio/archive/tar/writer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/archive/tar/writer.go
rename to vendor/github.com/Microsoft/go-winio/archive/tar/writer.go
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/backuptar/tar.go b/vendor/github.com/Microsoft/go-winio/backuptar/tar.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Microsoft/go-winio/backuptar/tar.go
rename to vendor/github.com/Microsoft/go-winio/backuptar/tar.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/Sirupsen/logrus/.gitignore b/vendor/github.com/Sirupsen/logrus/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/.gitignore
rename to vendor/github.com/Sirupsen/logrus/.gitignore
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml b/vendor/github.com/Sirupsen/logrus/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml
rename to vendor/github.com/Sirupsen/logrus/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE b/vendor/github.com/Sirupsen/logrus/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE
rename to vendor/github.com/Sirupsen/logrus/LICENSE
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/README.md b/vendor/github.com/Sirupsen/logrus/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/README.md
rename to vendor/github.com/Sirupsen/logrus/README.md
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/entry.go b/vendor/github.com/Sirupsen/logrus/entry.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/entry.go
rename to vendor/github.com/Sirupsen/logrus/entry.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/basic/basic.go b/vendor/github.com/Sirupsen/logrus/examples/basic/basic.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/basic/basic.go
rename to vendor/github.com/Sirupsen/logrus/examples/basic/basic.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/hook/hook.go b/vendor/github.com/Sirupsen/logrus/examples/hook/hook.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/hook/hook.go
rename to vendor/github.com/Sirupsen/logrus/examples/hook/hook.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/exported.go b/vendor/github.com/Sirupsen/logrus/exported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/exported.go
rename to vendor/github.com/Sirupsen/logrus/exported.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter.go b/vendor/github.com/Sirupsen/logrus/formatter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter.go
rename to vendor/github.com/Sirupsen/logrus/formatter.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks.go b/vendor/github.com/Sirupsen/logrus/hooks.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks.go
rename to vendor/github.com/Sirupsen/logrus/hooks.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go b/vendor/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go
rename to vendor/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/README.md b/vendor/github.com/Sirupsen/logrus/hooks/papertrail/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/README.md
rename to vendor/github.com/Sirupsen/logrus/hooks/papertrail/README.md
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go b/vendor/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go
rename to vendor/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/README.md b/vendor/github.com/Sirupsen/logrus/hooks/sentry/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/README.md
rename to vendor/github.com/Sirupsen/logrus/hooks/sentry/README.md
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry.go b/vendor/github.com/Sirupsen/logrus/hooks/sentry/sentry.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry.go
rename to vendor/github.com/Sirupsen/logrus/hooks/sentry/sentry.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/README.md b/vendor/github.com/Sirupsen/logrus/hooks/syslog/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/README.md
rename to vendor/github.com/Sirupsen/logrus/hooks/syslog/README.md
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog.go b/vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog.go
rename to vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter.go b/vendor/github.com/Sirupsen/logrus/json_formatter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter.go
rename to vendor/github.com/Sirupsen/logrus/json_formatter.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logger.go b/vendor/github.com/Sirupsen/logrus/logger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/logger.go
rename to vendor/github.com/Sirupsen/logrus/logger.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus.go b/vendor/github.com/Sirupsen/logrus/logrus.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus.go
rename to vendor/github.com/Sirupsen/logrus/logrus.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_darwin.go b/vendor/github.com/Sirupsen/logrus/terminal_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_darwin.go
rename to vendor/github.com/Sirupsen/logrus/terminal_darwin.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_freebsd.go b/vendor/github.com/Sirupsen/logrus/terminal_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_freebsd.go
rename to vendor/github.com/Sirupsen/logrus/terminal_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_linux.go b/vendor/github.com/Sirupsen/logrus/terminal_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_linux.go
rename to vendor/github.com/Sirupsen/logrus/terminal_linux.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_notwindows.go b/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_notwindows.go
rename to vendor/github.com/Sirupsen/logrus/terminal_notwindows.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_windows.go b/vendor/github.com/Sirupsen/logrus/terminal_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_windows.go
rename to vendor/github.com/Sirupsen/logrus/terminal_windows.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter.go b/vendor/github.com/Sirupsen/logrus/text_formatter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter.go
rename to vendor/github.com/Sirupsen/logrus/text_formatter.go
diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/.gitignore b/vendor/github.com/abbot/go-http-auth/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/.gitignore
rename to vendor/github.com/abbot/go-http-auth/.gitignore
diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/LICENSE b/vendor/github.com/abbot/go-http-auth/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/LICENSE
rename to vendor/github.com/abbot/go-http-auth/LICENSE
diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/Makefile b/vendor/github.com/abbot/go-http-auth/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/Makefile
rename to vendor/github.com/abbot/go-http-auth/Makefile
diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/README.md b/vendor/github.com/abbot/go-http-auth/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/README.md
rename to vendor/github.com/abbot/go-http-auth/README.md
diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/auth.go b/vendor/github.com/abbot/go-http-auth/auth.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/auth.go
rename to vendor/github.com/abbot/go-http-auth/auth.go
diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/basic.go b/vendor/github.com/abbot/go-http-auth/basic.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/basic.go
rename to vendor/github.com/abbot/go-http-auth/basic.go
diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/digest.go b/vendor/github.com/abbot/go-http-auth/digest.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/digest.go
rename to vendor/github.com/abbot/go-http-auth/digest.go
diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/examples/basic.go b/vendor/github.com/abbot/go-http-auth/examples/basic.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/examples/basic.go
rename to vendor/github.com/abbot/go-http-auth/examples/basic.go
diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/examples/digest.go b/vendor/github.com/abbot/go-http-auth/examples/digest.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/examples/digest.go
rename to vendor/github.com/abbot/go-http-auth/examples/digest.go
diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/examples/wrapped.go b/vendor/github.com/abbot/go-http-auth/examples/wrapped.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/examples/wrapped.go
rename to vendor/github.com/abbot/go-http-auth/examples/wrapped.go
diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/md5crypt.go b/vendor/github.com/abbot/go-http-auth/md5crypt.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/md5crypt.go
rename to vendor/github.com/abbot/go-http-auth/md5crypt.go
diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/misc.go b/vendor/github.com/abbot/go-http-auth/misc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/misc.go
rename to vendor/github.com/abbot/go-http-auth/misc.go
diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/test.htdigest b/vendor/github.com/abbot/go-http-auth/test.htdigest
similarity index 100%
rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/test.htdigest
rename to vendor/github.com/abbot/go-http-auth/test.htdigest
diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/test.htpasswd b/vendor/github.com/abbot/go-http-auth/test.htpasswd
similarity index 100%
rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/test.htpasswd
rename to vendor/github.com/abbot/go-http-auth/test.htpasswd
diff --git a/Godeps/_workspace/src/github.com/abbot/go-http-auth/users.go b/vendor/github.com/abbot/go-http-auth/users.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/abbot/go-http-auth/users.go
rename to vendor/github.com/abbot/go-http-auth/users.go
diff --git a/vendor/github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4/LICENSE b/vendor/github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4/LICENSE
new file mode 100644
index 0000000000..f7d058a358
--- /dev/null
+++ b/vendor/github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2013 Skagerrak Software Limited. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Skagerrak Software Limited nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/hashicorp/memberlist/LICENSE b/vendor/github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4client/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/hashicorp/memberlist/LICENSE
rename to vendor/github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4client/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/vishvananda/netlink/LICENSE b/vendor/github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/vishvananda/netlink/LICENSE
rename to vendor/github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE
diff --git a/Godeps/_workspace/src/github.com/appc/cni/LICENSE b/vendor/github.com/appc/cni/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/cni/LICENSE
rename to vendor/github.com/appc/cni/LICENSE
diff --git a/Godeps/_workspace/src/github.com/appc/cni/libcni/api.go b/vendor/github.com/appc/cni/libcni/api.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/cni/libcni/api.go
rename to vendor/github.com/appc/cni/libcni/api.go
diff --git a/Godeps/_workspace/src/github.com/appc/cni/libcni/conf.go b/vendor/github.com/appc/cni/libcni/conf.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/cni/libcni/conf.go
rename to vendor/github.com/appc/cni/libcni/conf.go
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/args.go b/vendor/github.com/appc/cni/pkg/invoke/args.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/args.go
rename to vendor/github.com/appc/cni/pkg/invoke/args.go
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/exec.go b/vendor/github.com/appc/cni/pkg/invoke/exec.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/exec.go
rename to vendor/github.com/appc/cni/pkg/invoke/exec.go
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/find.go b/vendor/github.com/appc/cni/pkg/invoke/find.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/find.go
rename to vendor/github.com/appc/cni/pkg/invoke/find.go
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/types/args.go b/vendor/github.com/appc/cni/pkg/types/args.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/cni/pkg/types/args.go
rename to vendor/github.com/appc/cni/pkg/types/args.go
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/types/types.go b/vendor/github.com/appc/cni/pkg/types/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/cni/pkg/types/types.go
rename to vendor/github.com/appc/cni/pkg/types/types.go
diff --git a/Godeps/_workspace/src/github.com/camlistore/go4/LICENSE b/vendor/github.com/appc/spec/Godeps/_workspace/src/github.com/camlistore/go4/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/camlistore/go4/LICENSE
rename to vendor/github.com/appc/spec/Godeps/_workspace/src/github.com/camlistore/go4/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/spf13/pflag/LICENSE b/vendor/github.com/appc/spec/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/spf13/pflag/LICENSE
rename to vendor/github.com/appc/spec/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE
diff --git a/Godeps/_workspace/src/github.com/hawkular/hawkular-client-go/LICENSE b/vendor/github.com/appc/spec/Godeps/_workspace/src/go4.org/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/hawkular/hawkular-client-go/LICENSE
rename to vendor/github.com/appc/spec/Godeps/_workspace/src/go4.org/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/golang.org/x/crypto/LICENSE b/vendor/github.com/appc/spec/Godeps/_workspace/src/golang.org/x/net/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/golang.org/x/crypto/LICENSE
rename to vendor/github.com/appc/spec/Godeps/_workspace/src/golang.org/x/net/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/golang.org/x/crypto/PATENTS b/vendor/github.com/appc/spec/Godeps/_workspace/src/golang.org/x/net/PATENTS
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/golang.org/x/crypto/PATENTS
rename to vendor/github.com/appc/spec/Godeps/_workspace/src/golang.org/x/net/PATENTS
diff --git a/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/LICENSE b/vendor/github.com/appc/spec/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/LICENSE
rename to vendor/github.com/appc/spec/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/LICENSE
diff --git a/Godeps/_workspace/src/github.com/appc/spec/LICENSE b/vendor/github.com/appc/spec/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/LICENSE
rename to vendor/github.com/appc/spec/LICENSE
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/common/common.go b/vendor/github.com/appc/spec/schema/common/common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/common/common.go
rename to vendor/github.com/appc/spec/schema/common/common.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/doc.go b/vendor/github.com/appc/spec/schema/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/doc.go
rename to vendor/github.com/appc/spec/schema/doc.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/image.go b/vendor/github.com/appc/spec/schema/image.go
similarity index 98%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/image.go
rename to vendor/github.com/appc/spec/schema/image.go
index 6ed62f6bac..fac4c794c3 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/image.go
+++ b/vendor/github.com/appc/spec/schema/image.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/appc/spec/schema/types"
 
-	"github.com/camlistore/go4/errorutil"
+	"go4.org/errorutil"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/kind.go b/vendor/github.com/appc/spec/schema/kind.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/kind.go
rename to vendor/github.com/appc/spec/schema/kind.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/doc.go b/vendor/github.com/appc/spec/schema/lastditch/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/doc.go
rename to vendor/github.com/appc/spec/schema/lastditch/doc.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/image.go b/vendor/github.com/appc/spec/schema/lastditch/image.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/image.go
rename to vendor/github.com/appc/spec/schema/lastditch/image.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/labels.go b/vendor/github.com/appc/spec/schema/lastditch/labels.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/labels.go
rename to vendor/github.com/appc/spec/schema/lastditch/labels.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/pod.go b/vendor/github.com/appc/spec/schema/lastditch/pod.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/pod.go
rename to vendor/github.com/appc/spec/schema/lastditch/pod.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go b/vendor/github.com/appc/spec/schema/pod.go
similarity index 99%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/pod.go
rename to vendor/github.com/appc/spec/schema/pod.go
index 694fed142f..b8699315f0 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go
+++ b/vendor/github.com/appc/spec/schema/pod.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/appc/spec/schema/types"
 
-	"github.com/camlistore/go4/errorutil"
+	"go4.org/errorutil"
 )
 
 const PodManifestKind = types.ACKind("PodManifest")
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/acidentifier.go b/vendor/github.com/appc/spec/schema/types/acidentifier.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/acidentifier.go
rename to vendor/github.com/appc/spec/schema/types/acidentifier.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/ackind.go b/vendor/github.com/appc/spec/schema/types/ackind.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/ackind.go
rename to vendor/github.com/appc/spec/schema/types/ackind.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/acname.go b/vendor/github.com/appc/spec/schema/types/acname.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/acname.go
rename to vendor/github.com/appc/spec/schema/types/acname.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/annotations.go b/vendor/github.com/appc/spec/schema/types/annotations.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/annotations.go
rename to vendor/github.com/appc/spec/schema/types/annotations.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/app.go b/vendor/github.com/appc/spec/schema/types/app.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/app.go
rename to vendor/github.com/appc/spec/schema/types/app.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/date.go b/vendor/github.com/appc/spec/schema/types/date.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/date.go
rename to vendor/github.com/appc/spec/schema/types/date.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/dependencies.go b/vendor/github.com/appc/spec/schema/types/dependencies.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/dependencies.go
rename to vendor/github.com/appc/spec/schema/types/dependencies.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/doc.go b/vendor/github.com/appc/spec/schema/types/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/doc.go
rename to vendor/github.com/appc/spec/schema/types/doc.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/environment.go b/vendor/github.com/appc/spec/schema/types/environment.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/environment.go
rename to vendor/github.com/appc/spec/schema/types/environment.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/errors.go b/vendor/github.com/appc/spec/schema/types/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/errors.go
rename to vendor/github.com/appc/spec/schema/types/errors.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/event_handler.go b/vendor/github.com/appc/spec/schema/types/event_handler.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/event_handler.go
rename to vendor/github.com/appc/spec/schema/types/event_handler.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/exec.go b/vendor/github.com/appc/spec/schema/types/exec.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/exec.go
rename to vendor/github.com/appc/spec/schema/types/exec.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/hash.go b/vendor/github.com/appc/spec/schema/types/hash.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/hash.go
rename to vendor/github.com/appc/spec/schema/types/hash.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator.go b/vendor/github.com/appc/spec/schema/types/isolator.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator.go
rename to vendor/github.com/appc/spec/schema/types/isolator.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_linux_specific.go b/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_linux_specific.go
rename to vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go b/vendor/github.com/appc/spec/schema/types/isolator_resources.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go
rename to vendor/github.com/appc/spec/schema/types/isolator_resources.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/labels.go b/vendor/github.com/appc/spec/schema/types/labels.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/labels.go
rename to vendor/github.com/appc/spec/schema/types/labels.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/mountpoint.go b/vendor/github.com/appc/spec/schema/types/mountpoint.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/mountpoint.go
rename to vendor/github.com/appc/spec/schema/types/mountpoint.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/port.go b/vendor/github.com/appc/spec/schema/types/port.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/port.go
rename to vendor/github.com/appc/spec/schema/types/port.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/semver.go b/vendor/github.com/appc/spec/schema/types/semver.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/semver.go
rename to vendor/github.com/appc/spec/schema/types/semver.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/url.go b/vendor/github.com/appc/spec/schema/types/url.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/url.go
rename to vendor/github.com/appc/spec/schema/types/url.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/uuid.go b/vendor/github.com/appc/spec/schema/types/uuid.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/uuid.go
rename to vendor/github.com/appc/spec/schema/types/uuid.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/volume.go b/vendor/github.com/appc/spec/schema/types/volume.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/types/volume.go
rename to vendor/github.com/appc/spec/schema/types/volume.go
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/version.go b/vendor/github.com/appc/spec/schema/version.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/appc/spec/schema/version.go
rename to vendor/github.com/appc/spec/schema/version.go
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/.gitignore b/vendor/github.com/armon/go-metrics/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/armon/go-metrics/.gitignore
rename to vendor/github.com/armon/go-metrics/.gitignore
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/LICENSE b/vendor/github.com/armon/go-metrics/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/armon/go-metrics/LICENSE
rename to vendor/github.com/armon/go-metrics/LICENSE
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/README.md b/vendor/github.com/armon/go-metrics/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/armon/go-metrics/README.md
rename to vendor/github.com/armon/go-metrics/README.md
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/const_unix.go b/vendor/github.com/armon/go-metrics/const_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/armon/go-metrics/const_unix.go
rename to vendor/github.com/armon/go-metrics/const_unix.go
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/const_windows.go b/vendor/github.com/armon/go-metrics/const_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/armon/go-metrics/const_windows.go
rename to vendor/github.com/armon/go-metrics/const_windows.go
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/datadog/dogstatsd.go b/vendor/github.com/armon/go-metrics/datadog/dogstatsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/armon/go-metrics/datadog/dogstatsd.go
rename to vendor/github.com/armon/go-metrics/datadog/dogstatsd.go
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/inmem.go b/vendor/github.com/armon/go-metrics/inmem.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/armon/go-metrics/inmem.go
rename to vendor/github.com/armon/go-metrics/inmem.go
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/inmem_signal.go b/vendor/github.com/armon/go-metrics/inmem_signal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/armon/go-metrics/inmem_signal.go
rename to vendor/github.com/armon/go-metrics/inmem_signal.go
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/metrics.go b/vendor/github.com/armon/go-metrics/metrics.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/armon/go-metrics/metrics.go
rename to vendor/github.com/armon/go-metrics/metrics.go
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/prometheus/prometheus.go b/vendor/github.com/armon/go-metrics/prometheus/prometheus.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/armon/go-metrics/prometheus/prometheus.go
rename to vendor/github.com/armon/go-metrics/prometheus/prometheus.go
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/sink.go b/vendor/github.com/armon/go-metrics/sink.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/armon/go-metrics/sink.go
rename to vendor/github.com/armon/go-metrics/sink.go
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/start.go b/vendor/github.com/armon/go-metrics/start.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/armon/go-metrics/start.go
rename to vendor/github.com/armon/go-metrics/start.go
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/statsd.go b/vendor/github.com/armon/go-metrics/statsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/armon/go-metrics/statsd.go
rename to vendor/github.com/armon/go-metrics/statsd.go
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/statsite.go b/vendor/github.com/armon/go-metrics/statsite.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/armon/go-metrics/statsite.go
rename to vendor/github.com/armon/go-metrics/statsite.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt b/vendor/github.com/aws/aws-sdk-go/LICENSE.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt
rename to vendor/github.com/aws/aws-sdk-go/LICENSE.txt
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt b/vendor/github.com/aws/aws-sdk-go/NOTICE.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt
rename to vendor/github.com/aws/aws-sdk-go/NOTICE.txt
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go b/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go b/vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/client.go b/vendor/github.com/aws/aws-sdk-go/aws/client/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/client.go
rename to vendor/github.com/aws/aws-sdk-go/aws/client/client.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/default_retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/default_retryer.go
rename to vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go b/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
rename to vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go b/vendor/github.com/aws/aws-sdk-go/aws/config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go
rename to vendor/github.com/aws/aws-sdk-go/aws/config.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go b/vendor/github.com/aws/aws-sdk-go/aws/convert_types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go
rename to vendor/github.com/aws/aws-sdk-go/aws/convert_types.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go
rename to vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go
rename to vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini b/vendor/github.com/aws/aws-sdk-go/aws/credentials/example.ini
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/example.ini
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/defaults/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
rename to vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
rename to vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go
rename to vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go b/vendor/github.com/aws/aws-sdk-go/aws/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go
rename to vendor/github.com/aws/aws-sdk-go/aws/errors.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go b/vendor/github.com/aws/aws-sdk-go/aws/logger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go
rename to vendor/github.com/aws/aws-sdk-go/aws/logger.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go
rename to vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go
rename to vendor/github.com/aws/aws-sdk-go/aws/request/request.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
rename to vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go
rename to vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/session/session.go b/vendor/github.com/aws/aws-sdk-go/aws/session/session.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/session/session.go
rename to vendor/github.com/aws/aws-sdk-go/aws/session/session.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go b/vendor/github.com/aws/aws-sdk-go/aws/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go
rename to vendor/github.com/aws/aws-sdk-go/aws/types.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go
rename to vendor/github.com/aws/aws-sdk-go/aws/version.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints.go b/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints.go
rename to vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json b/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json
rename to vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go b/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go
rename to vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/ec2query/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/build.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/ec2query/build.go
rename to vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/build.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go
rename to vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/build.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/build.go
rename to vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/build.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/unmarshal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/unmarshal.go
rename to vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/unmarshal.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go
rename to vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/build.go
rename to vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go
rename to vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go
rename to vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go
rename to vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
rename to vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go
rename to vendor/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
rename to vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go
rename to vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go
rename to vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go
rename to vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/v4.go b/vendor/github.com/aws/aws-sdk-go/private/signer/v4/v4.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/v4.go
rename to vendor/github.com/aws/aws-sdk-go/private/signer/v4/v4.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/waiter/waiter.go b/vendor/github.com/aws/aws-sdk-go/private/waiter/waiter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/waiter/waiter.go
rename to vendor/github.com/aws/aws-sdk-go/private/waiter/waiter.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/autoscaling/api.go b/vendor/github.com/aws/aws-sdk-go/service/autoscaling/api.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/autoscaling/api.go
rename to vendor/github.com/aws/aws-sdk-go/service/autoscaling/api.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/autoscaling/autoscalingiface/interface.go b/vendor/github.com/aws/aws-sdk-go/service/autoscaling/autoscalingiface/interface.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/autoscaling/autoscalingiface/interface.go
rename to vendor/github.com/aws/aws-sdk-go/service/autoscaling/autoscalingiface/interface.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/autoscaling/service.go b/vendor/github.com/aws/aws-sdk-go/service/autoscaling/service.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/autoscaling/service.go
rename to vendor/github.com/aws/aws-sdk-go/service/autoscaling/service.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/api.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/api.go
rename to vendor/github.com/aws/aws-sdk-go/service/ec2/api.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/customizations.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/customizations.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/customizations.go
rename to vendor/github.com/aws/aws-sdk-go/service/ec2/customizations.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface.go
rename to vendor/github.com/aws/aws-sdk-go/service/ec2/ec2iface/interface.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/service.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/service.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/service.go
rename to vendor/github.com/aws/aws-sdk-go/service/ec2/service.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/waiters.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/waiters.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2/waiters.go
rename to vendor/github.com/aws/aws-sdk-go/service/ec2/waiters.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ecr/api.go b/vendor/github.com/aws/aws-sdk-go/service/ecr/api.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ecr/api.go
rename to vendor/github.com/aws/aws-sdk-go/service/ecr/api.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ecr/ecriface/interface.go b/vendor/github.com/aws/aws-sdk-go/service/ecr/ecriface/interface.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ecr/ecriface/interface.go
rename to vendor/github.com/aws/aws-sdk-go/service/ecr/ecriface/interface.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ecr/service.go b/vendor/github.com/aws/aws-sdk-go/service/ecr/service.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ecr/service.go
rename to vendor/github.com/aws/aws-sdk-go/service/ecr/service.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/elb/api.go b/vendor/github.com/aws/aws-sdk-go/service/elb/api.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/elb/api.go
rename to vendor/github.com/aws/aws-sdk-go/service/elb/api.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/elb/elbiface/interface.go b/vendor/github.com/aws/aws-sdk-go/service/elb/elbiface/interface.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/elb/elbiface/interface.go
rename to vendor/github.com/aws/aws-sdk-go/service/elb/elbiface/interface.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/elb/service.go b/vendor/github.com/aws/aws-sdk-go/service/elb/service.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/elb/service.go
rename to vendor/github.com/aws/aws-sdk-go/service/elb/service.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/elb/waiters.go b/vendor/github.com/aws/aws-sdk-go/service/elb/waiters.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/elb/waiters.go
rename to vendor/github.com/aws/aws-sdk-go/service/elb/waiters.go
diff --git a/Godeps/_workspace/src/github.com/beorn7/perks/quantile/exampledata.txt b/vendor/github.com/beorn7/perks/quantile/exampledata.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/beorn7/perks/quantile/exampledata.txt
rename to vendor/github.com/beorn7/perks/quantile/exampledata.txt
diff --git a/Godeps/_workspace/src/github.com/beorn7/perks/quantile/stream.go b/vendor/github.com/beorn7/perks/quantile/stream.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/beorn7/perks/quantile/stream.go
rename to vendor/github.com/beorn7/perks/quantile/stream.go
diff --git a/Godeps/_workspace/src/github.com/blang/semver/LICENSE b/vendor/github.com/blang/semver/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/blang/semver/LICENSE
rename to vendor/github.com/blang/semver/LICENSE
diff --git a/Godeps/_workspace/src/github.com/blang/semver/README.md b/vendor/github.com/blang/semver/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/blang/semver/README.md
rename to vendor/github.com/blang/semver/README.md
diff --git a/Godeps/_workspace/src/github.com/blang/semver/examples/main.go b/vendor/github.com/blang/semver/examples/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/blang/semver/examples/main.go
rename to vendor/github.com/blang/semver/examples/main.go
diff --git a/Godeps/_workspace/src/github.com/blang/semver/json.go b/vendor/github.com/blang/semver/json.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/blang/semver/json.go
rename to vendor/github.com/blang/semver/json.go
diff --git a/Godeps/_workspace/src/github.com/blang/semver/semver.go b/vendor/github.com/blang/semver/semver.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/blang/semver/semver.go
rename to vendor/github.com/blang/semver/semver.go
diff --git a/Godeps/_workspace/src/github.com/blang/semver/sort.go b/vendor/github.com/blang/semver/sort.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/blang/semver/sort.go
rename to vendor/github.com/blang/semver/sort.go
diff --git a/Godeps/_workspace/src/github.com/blang/semver/sql.go b/vendor/github.com/blang/semver/sql.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/blang/semver/sql.go
rename to vendor/github.com/blang/semver/sql.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/.gitignore b/vendor/github.com/boltdb/bolt/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/.gitignore
rename to vendor/github.com/boltdb/bolt/.gitignore
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/LICENSE b/vendor/github.com/boltdb/bolt/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/LICENSE
rename to vendor/github.com/boltdb/bolt/LICENSE
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/Makefile b/vendor/github.com/boltdb/bolt/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/Makefile
rename to vendor/github.com/boltdb/bolt/Makefile
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/README.md b/vendor/github.com/boltdb/bolt/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/README.md
rename to vendor/github.com/boltdb/bolt/README.md
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_386.go b/vendor/github.com/boltdb/bolt/bolt_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/bolt_386.go
rename to vendor/github.com/boltdb/bolt/bolt_386.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_amd64.go b/vendor/github.com/boltdb/bolt/bolt_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/bolt_amd64.go
rename to vendor/github.com/boltdb/bolt/bolt_amd64.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_arm.go b/vendor/github.com/boltdb/bolt/bolt_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/bolt_arm.go
rename to vendor/github.com/boltdb/bolt/bolt_arm.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_arm64.go b/vendor/github.com/boltdb/bolt/bolt_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/bolt_arm64.go
rename to vendor/github.com/boltdb/bolt/bolt_arm64.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_linux.go b/vendor/github.com/boltdb/bolt/bolt_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/bolt_linux.go
rename to vendor/github.com/boltdb/bolt/bolt_linux.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_openbsd.go b/vendor/github.com/boltdb/bolt/bolt_openbsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/bolt_openbsd.go
rename to vendor/github.com/boltdb/bolt/bolt_openbsd.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_ppc64le.go b/vendor/github.com/boltdb/bolt/bolt_ppc64le.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/bolt_ppc64le.go
rename to vendor/github.com/boltdb/bolt/bolt_ppc64le.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_s390x.go b/vendor/github.com/boltdb/bolt/bolt_s390x.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/bolt_s390x.go
rename to vendor/github.com/boltdb/bolt/bolt_s390x.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_unix.go b/vendor/github.com/boltdb/bolt/bolt_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/bolt_unix.go
rename to vendor/github.com/boltdb/bolt/bolt_unix.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_unix_solaris.go b/vendor/github.com/boltdb/bolt/bolt_unix_solaris.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/bolt_unix_solaris.go
rename to vendor/github.com/boltdb/bolt/bolt_unix_solaris.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_windows.go b/vendor/github.com/boltdb/bolt/bolt_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/bolt_windows.go
rename to vendor/github.com/boltdb/bolt/bolt_windows.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/boltsync_unix.go b/vendor/github.com/boltdb/bolt/boltsync_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/boltsync_unix.go
rename to vendor/github.com/boltdb/bolt/boltsync_unix.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bucket.go b/vendor/github.com/boltdb/bolt/bucket.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/bucket.go
rename to vendor/github.com/boltdb/bolt/bucket.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/cmd/bolt/main.go b/vendor/github.com/boltdb/bolt/cmd/bolt/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/cmd/bolt/main.go
rename to vendor/github.com/boltdb/bolt/cmd/bolt/main.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/cursor.go b/vendor/github.com/boltdb/bolt/cursor.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/cursor.go
rename to vendor/github.com/boltdb/bolt/cursor.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/db.go b/vendor/github.com/boltdb/bolt/db.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/db.go
rename to vendor/github.com/boltdb/bolt/db.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/doc.go b/vendor/github.com/boltdb/bolt/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/doc.go
rename to vendor/github.com/boltdb/bolt/doc.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/errors.go b/vendor/github.com/boltdb/bolt/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/errors.go
rename to vendor/github.com/boltdb/bolt/errors.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/freelist.go b/vendor/github.com/boltdb/bolt/freelist.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/freelist.go
rename to vendor/github.com/boltdb/bolt/freelist.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/node.go b/vendor/github.com/boltdb/bolt/node.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/node.go
rename to vendor/github.com/boltdb/bolt/node.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/page.go b/vendor/github.com/boltdb/bolt/page.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/page.go
rename to vendor/github.com/boltdb/bolt/page.go
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/tx.go b/vendor/github.com/boltdb/bolt/tx.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/boltdb/bolt/tx.go
rename to vendor/github.com/boltdb/bolt/tx.go
diff --git a/Godeps/_workspace/src/github.com/codegangsta/negroni/LICENSE b/vendor/github.com/codegangsta/negroni/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/negroni/LICENSE
rename to vendor/github.com/codegangsta/negroni/LICENSE
diff --git a/Godeps/_workspace/src/github.com/codegangsta/negroni/README.md b/vendor/github.com/codegangsta/negroni/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/negroni/README.md
rename to vendor/github.com/codegangsta/negroni/README.md
diff --git a/Godeps/_workspace/src/github.com/codegangsta/negroni/doc.go b/vendor/github.com/codegangsta/negroni/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/negroni/doc.go
rename to vendor/github.com/codegangsta/negroni/doc.go
diff --git a/Godeps/_workspace/src/github.com/codegangsta/negroni/logger.go b/vendor/github.com/codegangsta/negroni/logger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/negroni/logger.go
rename to vendor/github.com/codegangsta/negroni/logger.go
diff --git a/Godeps/_workspace/src/github.com/codegangsta/negroni/negroni.go b/vendor/github.com/codegangsta/negroni/negroni.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/negroni/negroni.go
rename to vendor/github.com/codegangsta/negroni/negroni.go
diff --git a/Godeps/_workspace/src/github.com/codegangsta/negroni/recovery.go b/vendor/github.com/codegangsta/negroni/recovery.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/negroni/recovery.go
rename to vendor/github.com/codegangsta/negroni/recovery.go
diff --git a/Godeps/_workspace/src/github.com/codegangsta/negroni/response_writer.go b/vendor/github.com/codegangsta/negroni/response_writer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/negroni/response_writer.go
rename to vendor/github.com/codegangsta/negroni/response_writer.go
diff --git a/Godeps/_workspace/src/github.com/codegangsta/negroni/static.go b/vendor/github.com/codegangsta/negroni/static.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/negroni/static.go
rename to vendor/github.com/codegangsta/negroni/static.go
diff --git a/Godeps/_workspace/src/github.com/codegangsta/negroni/translations/README_pt_br.md b/vendor/github.com/codegangsta/negroni/translations/README_pt_br.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/negroni/translations/README_pt_br.md
rename to vendor/github.com/codegangsta/negroni/translations/README_pt_br.md
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/LICENSE b/vendor/github.com/coreos/etcd/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/LICENSE
rename to vendor/github.com/coreos/etcd/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/NOTICE b/vendor/github.com/coreos/etcd/NOTICE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/NOTICE
rename to vendor/github.com/coreos/etcd/NOTICE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/alarm/alarms.go b/vendor/github.com/coreos/etcd/alarm/alarms.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/alarm/alarms.go
rename to vendor/github.com/coreos/etcd/alarm/alarms.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/auth/authpb/auth.pb.go b/vendor/github.com/coreos/etcd/auth/authpb/auth.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/auth/authpb/auth.pb.go
rename to vendor/github.com/coreos/etcd/auth/authpb/auth.pb.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/auth/authpb/auth.proto b/vendor/github.com/coreos/etcd/auth/authpb/auth.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/auth/authpb/auth.proto
rename to vendor/github.com/coreos/etcd/auth/authpb/auth.proto
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/auth/store.go b/vendor/github.com/coreos/etcd/auth/store.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/auth/store.go
rename to vendor/github.com/coreos/etcd/auth/store.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/README.md b/vendor/github.com/coreos/etcd/client/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/README.md
rename to vendor/github.com/coreos/etcd/client/README.md
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/auth_role.go b/vendor/github.com/coreos/etcd/client/auth_role.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/auth_role.go
rename to vendor/github.com/coreos/etcd/client/auth_role.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/auth_user.go b/vendor/github.com/coreos/etcd/client/auth_user.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/auth_user.go
rename to vendor/github.com/coreos/etcd/client/auth_user.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/cancelreq.go b/vendor/github.com/coreos/etcd/client/cancelreq.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/cancelreq.go
rename to vendor/github.com/coreos/etcd/client/cancelreq.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/client.go b/vendor/github.com/coreos/etcd/client/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/client.go
rename to vendor/github.com/coreos/etcd/client/client.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/cluster_error.go b/vendor/github.com/coreos/etcd/client/cluster_error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/cluster_error.go
rename to vendor/github.com/coreos/etcd/client/cluster_error.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/curl.go b/vendor/github.com/coreos/etcd/client/curl.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/curl.go
rename to vendor/github.com/coreos/etcd/client/curl.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/discover.go b/vendor/github.com/coreos/etcd/client/discover.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/discover.go
rename to vendor/github.com/coreos/etcd/client/discover.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/doc.go b/vendor/github.com/coreos/etcd/client/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/doc.go
rename to vendor/github.com/coreos/etcd/client/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/keys.generated.go b/vendor/github.com/coreos/etcd/client/keys.generated.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/keys.generated.go
rename to vendor/github.com/coreos/etcd/client/keys.generated.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/keys.go b/vendor/github.com/coreos/etcd/client/keys.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/keys.go
rename to vendor/github.com/coreos/etcd/client/keys.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/members.go b/vendor/github.com/coreos/etcd/client/members.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/members.go
rename to vendor/github.com/coreos/etcd/client/members.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/srv.go b/vendor/github.com/coreos/etcd/client/srv.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/srv.go
rename to vendor/github.com/coreos/etcd/client/srv.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/client/util.go b/vendor/github.com/coreos/etcd/client/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/client/util.go
rename to vendor/github.com/coreos/etcd/client/util.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/README.md b/vendor/github.com/coreos/etcd/clientv3/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/README.md
rename to vendor/github.com/coreos/etcd/clientv3/README.md
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/auth.go b/vendor/github.com/coreos/etcd/clientv3/auth.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/auth.go
rename to vendor/github.com/coreos/etcd/clientv3/auth.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/client.go b/vendor/github.com/coreos/etcd/clientv3/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/client.go
rename to vendor/github.com/coreos/etcd/clientv3/client.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/cluster.go b/vendor/github.com/coreos/etcd/clientv3/cluster.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/cluster.go
rename to vendor/github.com/coreos/etcd/clientv3/cluster.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/compare.go b/vendor/github.com/coreos/etcd/clientv3/compare.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/compare.go
rename to vendor/github.com/coreos/etcd/clientv3/compare.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/concurrency/doc.go b/vendor/github.com/coreos/etcd/clientv3/concurrency/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/concurrency/doc.go
rename to vendor/github.com/coreos/etcd/clientv3/concurrency/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/concurrency/election.go b/vendor/github.com/coreos/etcd/clientv3/concurrency/election.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/concurrency/election.go
rename to vendor/github.com/coreos/etcd/clientv3/concurrency/election.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/concurrency/key.go b/vendor/github.com/coreos/etcd/clientv3/concurrency/key.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/concurrency/key.go
rename to vendor/github.com/coreos/etcd/clientv3/concurrency/key.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/concurrency/mutex.go b/vendor/github.com/coreos/etcd/clientv3/concurrency/mutex.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/concurrency/mutex.go
rename to vendor/github.com/coreos/etcd/clientv3/concurrency/mutex.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/concurrency/session.go b/vendor/github.com/coreos/etcd/clientv3/concurrency/session.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/concurrency/session.go
rename to vendor/github.com/coreos/etcd/clientv3/concurrency/session.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/concurrency/stm.go b/vendor/github.com/coreos/etcd/clientv3/concurrency/stm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/concurrency/stm.go
rename to vendor/github.com/coreos/etcd/clientv3/concurrency/stm.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/config.go b/vendor/github.com/coreos/etcd/clientv3/config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/config.go
rename to vendor/github.com/coreos/etcd/clientv3/config.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/doc.go b/vendor/github.com/coreos/etcd/clientv3/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/doc.go
rename to vendor/github.com/coreos/etcd/clientv3/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/integration/doc.go b/vendor/github.com/coreos/etcd/clientv3/integration/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/integration/doc.go
rename to vendor/github.com/coreos/etcd/clientv3/integration/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/kv.go b/vendor/github.com/coreos/etcd/clientv3/kv.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/kv.go
rename to vendor/github.com/coreos/etcd/clientv3/kv.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/lease.go b/vendor/github.com/coreos/etcd/clientv3/lease.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/lease.go
rename to vendor/github.com/coreos/etcd/clientv3/lease.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/logger.go b/vendor/github.com/coreos/etcd/clientv3/logger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/logger.go
rename to vendor/github.com/coreos/etcd/clientv3/logger.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/maintenance.go b/vendor/github.com/coreos/etcd/clientv3/maintenance.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/maintenance.go
rename to vendor/github.com/coreos/etcd/clientv3/maintenance.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/mirror/syncer.go b/vendor/github.com/coreos/etcd/clientv3/mirror/syncer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/mirror/syncer.go
rename to vendor/github.com/coreos/etcd/clientv3/mirror/syncer.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/op.go b/vendor/github.com/coreos/etcd/clientv3/op.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/op.go
rename to vendor/github.com/coreos/etcd/clientv3/op.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/sort.go b/vendor/github.com/coreos/etcd/clientv3/sort.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/sort.go
rename to vendor/github.com/coreos/etcd/clientv3/sort.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/txn.go b/vendor/github.com/coreos/etcd/clientv3/txn.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/txn.go
rename to vendor/github.com/coreos/etcd/clientv3/txn.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/clientv3/watch.go b/vendor/github.com/coreos/etcd/clientv3/watch.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/clientv3/watch.go
rename to vendor/github.com/coreos/etcd/clientv3/watch.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/compactor/compactor.go b/vendor/github.com/coreos/etcd/compactor/compactor.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/compactor/compactor.go
rename to vendor/github.com/coreos/etcd/compactor/compactor.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/discovery/discovery.go b/vendor/github.com/coreos/etcd/discovery/discovery.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/discovery/discovery.go
rename to vendor/github.com/coreos/etcd/discovery/discovery.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/discovery/srv.go b/vendor/github.com/coreos/etcd/discovery/srv.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/discovery/srv.go
rename to vendor/github.com/coreos/etcd/discovery/srv.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/error/error.go b/vendor/github.com/coreos/etcd/error/error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/error/error.go
rename to vendor/github.com/coreos/etcd/error/error.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/cluster.go b/vendor/github.com/coreos/etcd/etcdserver/api/cluster.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/cluster.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/cluster.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/capability.go b/vendor/github.com/coreos/etcd/etcdserver/api/v2http/capability.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/capability.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v2http/capability.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/client.go b/vendor/github.com/coreos/etcd/etcdserver/api/v2http/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/client.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v2http/client.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/client_auth.go b/vendor/github.com/coreos/etcd/etcdserver/api/v2http/client_auth.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/client_auth.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v2http/client_auth.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/doc.go b/vendor/github.com/coreos/etcd/etcdserver/api/v2http/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/doc.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v2http/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/http.go b/vendor/github.com/coreos/etcd/etcdserver/api/v2http/http.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/http.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v2http/http.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/httptypes/errors.go b/vendor/github.com/coreos/etcd/etcdserver/api/v2http/httptypes/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/httptypes/errors.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v2http/httptypes/errors.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/httptypes/member.go b/vendor/github.com/coreos/etcd/etcdserver/api/v2http/httptypes/member.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/httptypes/member.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v2http/httptypes/member.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/metrics.go b/vendor/github.com/coreos/etcd/etcdserver/api/v2http/metrics.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/metrics.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v2http/metrics.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/peer.go b/vendor/github.com/coreos/etcd/etcdserver/api/v2http/peer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v2http/peer.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v2http/peer.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/auth.go b/vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/auth.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/auth.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/auth.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/grpc.go b/vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/grpc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/grpc.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/grpc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/header.go b/vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/header.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/header.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/header.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/key.go b/vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/key.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/key.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/key.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/lease.go b/vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/lease.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/lease.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/lease.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/maintenance.go b/vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/maintenance.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/maintenance.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/maintenance.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/member.go b/vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/member.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/member.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/member.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/quota.go b/vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/quota.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/quota.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/quota.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes/error.go b/vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes/error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes/error.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes/error.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/util.go b/vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/util.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/util.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/watch.go b/vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/watch.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/api/v3rpc/watch.go
rename to vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/watch.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/apply.go b/vendor/github.com/coreos/etcd/etcdserver/apply.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/apply.go
rename to vendor/github.com/coreos/etcd/etcdserver/apply.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/auth/auth.go b/vendor/github.com/coreos/etcd/etcdserver/auth/auth.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/auth/auth.go
rename to vendor/github.com/coreos/etcd/etcdserver/auth/auth.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/auth/auth_requests.go b/vendor/github.com/coreos/etcd/etcdserver/auth/auth_requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/auth/auth_requests.go
rename to vendor/github.com/coreos/etcd/etcdserver/auth/auth_requests.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/cluster_util.go b/vendor/github.com/coreos/etcd/etcdserver/cluster_util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/cluster_util.go
rename to vendor/github.com/coreos/etcd/etcdserver/cluster_util.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/config.go b/vendor/github.com/coreos/etcd/etcdserver/config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/config.go
rename to vendor/github.com/coreos/etcd/etcdserver/config.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/consistent_index.go b/vendor/github.com/coreos/etcd/etcdserver/consistent_index.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/consistent_index.go
rename to vendor/github.com/coreos/etcd/etcdserver/consistent_index.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/doc.go b/vendor/github.com/coreos/etcd/etcdserver/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/doc.go
rename to vendor/github.com/coreos/etcd/etcdserver/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/errors.go b/vendor/github.com/coreos/etcd/etcdserver/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/errors.go
rename to vendor/github.com/coreos/etcd/etcdserver/errors.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/etcdserverpb/etcdserver.pb.go b/vendor/github.com/coreos/etcd/etcdserver/etcdserverpb/etcdserver.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/etcdserverpb/etcdserver.pb.go
rename to vendor/github.com/coreos/etcd/etcdserver/etcdserverpb/etcdserver.pb.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/etcdserverpb/etcdserver.proto b/vendor/github.com/coreos/etcd/etcdserver/etcdserverpb/etcdserver.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/etcdserverpb/etcdserver.proto
rename to vendor/github.com/coreos/etcd/etcdserver/etcdserverpb/etcdserver.proto
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/etcdserverpb/raft_internal.pb.go b/vendor/github.com/coreos/etcd/etcdserver/etcdserverpb/raft_internal.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/etcdserverpb/raft_internal.pb.go
rename to vendor/github.com/coreos/etcd/etcdserver/etcdserverpb/raft_internal.pb.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/etcdserverpb/raft_internal.proto b/vendor/github.com/coreos/etcd/etcdserver/etcdserverpb/raft_internal.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/etcdserverpb/raft_internal.proto
rename to vendor/github.com/coreos/etcd/etcdserver/etcdserverpb/raft_internal.proto
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/etcdserverpb/rpc.pb.go b/vendor/github.com/coreos/etcd/etcdserver/etcdserverpb/rpc.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/etcdserverpb/rpc.pb.go
rename to vendor/github.com/coreos/etcd/etcdserver/etcdserverpb/rpc.pb.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/etcdserverpb/rpc.proto b/vendor/github.com/coreos/etcd/etcdserver/etcdserverpb/rpc.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/etcdserverpb/rpc.proto
rename to vendor/github.com/coreos/etcd/etcdserver/etcdserverpb/rpc.proto
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/membership/cluster.go b/vendor/github.com/coreos/etcd/etcdserver/membership/cluster.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/membership/cluster.go
rename to vendor/github.com/coreos/etcd/etcdserver/membership/cluster.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/membership/errors.go b/vendor/github.com/coreos/etcd/etcdserver/membership/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/membership/errors.go
rename to vendor/github.com/coreos/etcd/etcdserver/membership/errors.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/membership/member.go b/vendor/github.com/coreos/etcd/etcdserver/membership/member.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/membership/member.go
rename to vendor/github.com/coreos/etcd/etcdserver/membership/member.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/membership/store.go b/vendor/github.com/coreos/etcd/etcdserver/membership/store.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/membership/store.go
rename to vendor/github.com/coreos/etcd/etcdserver/membership/store.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/metrics.go b/vendor/github.com/coreos/etcd/etcdserver/metrics.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/metrics.go
rename to vendor/github.com/coreos/etcd/etcdserver/metrics.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/quota.go b/vendor/github.com/coreos/etcd/etcdserver/quota.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/quota.go
rename to vendor/github.com/coreos/etcd/etcdserver/quota.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/raft.go b/vendor/github.com/coreos/etcd/etcdserver/raft.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/raft.go
rename to vendor/github.com/coreos/etcd/etcdserver/raft.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/server.go b/vendor/github.com/coreos/etcd/etcdserver/server.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/server.go
rename to vendor/github.com/coreos/etcd/etcdserver/server.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/snapshot_merge.go b/vendor/github.com/coreos/etcd/etcdserver/snapshot_merge.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/snapshot_merge.go
rename to vendor/github.com/coreos/etcd/etcdserver/snapshot_merge.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/stats/leader.go b/vendor/github.com/coreos/etcd/etcdserver/stats/leader.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/stats/leader.go
rename to vendor/github.com/coreos/etcd/etcdserver/stats/leader.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/stats/queue.go b/vendor/github.com/coreos/etcd/etcdserver/stats/queue.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/stats/queue.go
rename to vendor/github.com/coreos/etcd/etcdserver/stats/queue.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/stats/server.go b/vendor/github.com/coreos/etcd/etcdserver/stats/server.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/stats/server.go
rename to vendor/github.com/coreos/etcd/etcdserver/stats/server.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/stats/stats.go b/vendor/github.com/coreos/etcd/etcdserver/stats/stats.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/stats/stats.go
rename to vendor/github.com/coreos/etcd/etcdserver/stats/stats.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/storage.go b/vendor/github.com/coreos/etcd/etcdserver/storage.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/storage.go
rename to vendor/github.com/coreos/etcd/etcdserver/storage.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/util.go b/vendor/github.com/coreos/etcd/etcdserver/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/util.go
rename to vendor/github.com/coreos/etcd/etcdserver/util.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/v3demo_server.go b/vendor/github.com/coreos/etcd/etcdserver/v3demo_server.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/etcdserver/v3demo_server.go
rename to vendor/github.com/coreos/etcd/etcdserver/v3demo_server.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/integration/cluster.go b/vendor/github.com/coreos/etcd/integration/cluster.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/integration/cluster.go
rename to vendor/github.com/coreos/etcd/integration/cluster.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/integration/doc.go b/vendor/github.com/coreos/etcd/integration/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/integration/doc.go
rename to vendor/github.com/coreos/etcd/integration/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/integration/fixtures/ca.crt b/vendor/github.com/coreos/etcd/integration/fixtures/ca.crt
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/integration/fixtures/ca.crt
rename to vendor/github.com/coreos/etcd/integration/fixtures/ca.crt
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/integration/fixtures/server.crt b/vendor/github.com/coreos/etcd/integration/fixtures/server.crt
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/integration/fixtures/server.crt
rename to vendor/github.com/coreos/etcd/integration/fixtures/server.crt
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/integration/fixtures/server.key.insecure b/vendor/github.com/coreos/etcd/integration/fixtures/server.key.insecure
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/integration/fixtures/server.key.insecure
rename to vendor/github.com/coreos/etcd/integration/fixtures/server.key.insecure
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/lease/leasehttp/http.go b/vendor/github.com/coreos/etcd/lease/leasehttp/http.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/lease/leasehttp/http.go
rename to vendor/github.com/coreos/etcd/lease/leasehttp/http.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/lease/leasepb/lease.pb.go b/vendor/github.com/coreos/etcd/lease/leasepb/lease.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/lease/leasepb/lease.pb.go
rename to vendor/github.com/coreos/etcd/lease/leasepb/lease.pb.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/lease/leasepb/lease.proto b/vendor/github.com/coreos/etcd/lease/leasepb/lease.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/lease/leasepb/lease.proto
rename to vendor/github.com/coreos/etcd/lease/leasepb/lease.proto
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/lease/lessor.go b/vendor/github.com/coreos/etcd/lease/lessor.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/lease/lessor.go
rename to vendor/github.com/coreos/etcd/lease/lessor.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/adt/interval_tree.go b/vendor/github.com/coreos/etcd/pkg/adt/interval_tree.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/adt/interval_tree.go
rename to vendor/github.com/coreos/etcd/pkg/adt/interval_tree.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/contention/contention.go b/vendor/github.com/coreos/etcd/pkg/contention/contention.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/contention/contention.go
rename to vendor/github.com/coreos/etcd/pkg/contention/contention.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/crc/crc.go b/vendor/github.com/coreos/etcd/pkg/crc/crc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/crc/crc.go
rename to vendor/github.com/coreos/etcd/pkg/crc/crc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/fileutil.go b/vendor/github.com/coreos/etcd/pkg/fileutil/fileutil.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/fileutil.go
rename to vendor/github.com/coreos/etcd/pkg/fileutil/fileutil.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/lock.go b/vendor/github.com/coreos/etcd/pkg/fileutil/lock.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/lock.go
rename to vendor/github.com/coreos/etcd/pkg/fileutil/lock.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/lock_plan9.go b/vendor/github.com/coreos/etcd/pkg/fileutil/lock_plan9.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/lock_plan9.go
rename to vendor/github.com/coreos/etcd/pkg/fileutil/lock_plan9.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/lock_solaris.go b/vendor/github.com/coreos/etcd/pkg/fileutil/lock_solaris.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/lock_solaris.go
rename to vendor/github.com/coreos/etcd/pkg/fileutil/lock_solaris.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/lock_unix.go b/vendor/github.com/coreos/etcd/pkg/fileutil/lock_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/lock_unix.go
rename to vendor/github.com/coreos/etcd/pkg/fileutil/lock_unix.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/lock_windows.go b/vendor/github.com/coreos/etcd/pkg/fileutil/lock_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/lock_windows.go
rename to vendor/github.com/coreos/etcd/pkg/fileutil/lock_windows.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/preallocate.go b/vendor/github.com/coreos/etcd/pkg/fileutil/preallocate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/preallocate.go
rename to vendor/github.com/coreos/etcd/pkg/fileutil/preallocate.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/preallocate_darwin.go b/vendor/github.com/coreos/etcd/pkg/fileutil/preallocate_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/preallocate_darwin.go
rename to vendor/github.com/coreos/etcd/pkg/fileutil/preallocate_darwin.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/preallocate_unix.go b/vendor/github.com/coreos/etcd/pkg/fileutil/preallocate_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/preallocate_unix.go
rename to vendor/github.com/coreos/etcd/pkg/fileutil/preallocate_unix.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/preallocate_unsupported.go b/vendor/github.com/coreos/etcd/pkg/fileutil/preallocate_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/preallocate_unsupported.go
rename to vendor/github.com/coreos/etcd/pkg/fileutil/preallocate_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/purge.go b/vendor/github.com/coreos/etcd/pkg/fileutil/purge.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/purge.go
rename to vendor/github.com/coreos/etcd/pkg/fileutil/purge.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/sync.go b/vendor/github.com/coreos/etcd/pkg/fileutil/sync.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/sync.go
rename to vendor/github.com/coreos/etcd/pkg/fileutil/sync.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/sync_linux.go b/vendor/github.com/coreos/etcd/pkg/fileutil/sync_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/fileutil/sync_linux.go
rename to vendor/github.com/coreos/etcd/pkg/fileutil/sync_linux.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/httputil/httputil.go b/vendor/github.com/coreos/etcd/pkg/httputil/httputil.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/httputil/httputil.go
rename to vendor/github.com/coreos/etcd/pkg/httputil/httputil.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/idutil/id.go b/vendor/github.com/coreos/etcd/pkg/idutil/id.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/idutil/id.go
rename to vendor/github.com/coreos/etcd/pkg/idutil/id.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/ioutil/readcloser.go b/vendor/github.com/coreos/etcd/pkg/ioutil/readcloser.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/ioutil/readcloser.go
rename to vendor/github.com/coreos/etcd/pkg/ioutil/readcloser.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/ioutil/reader.go b/vendor/github.com/coreos/etcd/pkg/ioutil/reader.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/ioutil/reader.go
rename to vendor/github.com/coreos/etcd/pkg/ioutil/reader.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/ioutil/util.go b/vendor/github.com/coreos/etcd/pkg/ioutil/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/ioutil/util.go
rename to vendor/github.com/coreos/etcd/pkg/ioutil/util.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/logutil/merge_logger.go b/vendor/github.com/coreos/etcd/pkg/logutil/merge_logger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/logutil/merge_logger.go
rename to vendor/github.com/coreos/etcd/pkg/logutil/merge_logger.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/netutil/isolate_linux.go b/vendor/github.com/coreos/etcd/pkg/netutil/isolate_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/netutil/isolate_linux.go
rename to vendor/github.com/coreos/etcd/pkg/netutil/isolate_linux.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/netutil/isolate_stub.go b/vendor/github.com/coreos/etcd/pkg/netutil/isolate_stub.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/netutil/isolate_stub.go
rename to vendor/github.com/coreos/etcd/pkg/netutil/isolate_stub.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/netutil/netutil.go b/vendor/github.com/coreos/etcd/pkg/netutil/netutil.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/netutil/netutil.go
rename to vendor/github.com/coreos/etcd/pkg/netutil/netutil.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/pathutil/path.go b/vendor/github.com/coreos/etcd/pkg/pathutil/path.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/pathutil/path.go
rename to vendor/github.com/coreos/etcd/pkg/pathutil/path.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/pbutil/pbutil.go b/vendor/github.com/coreos/etcd/pkg/pbutil/pbutil.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/pbutil/pbutil.go
rename to vendor/github.com/coreos/etcd/pkg/pbutil/pbutil.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/runtime/fds_linux.go b/vendor/github.com/coreos/etcd/pkg/runtime/fds_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/runtime/fds_linux.go
rename to vendor/github.com/coreos/etcd/pkg/runtime/fds_linux.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/runtime/fds_other.go b/vendor/github.com/coreos/etcd/pkg/runtime/fds_other.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/runtime/fds_other.go
rename to vendor/github.com/coreos/etcd/pkg/runtime/fds_other.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/schedule/schedule.go b/vendor/github.com/coreos/etcd/pkg/schedule/schedule.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/schedule/schedule.go
rename to vendor/github.com/coreos/etcd/pkg/schedule/schedule.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/testutil/leak.go b/vendor/github.com/coreos/etcd/pkg/testutil/leak.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/testutil/leak.go
rename to vendor/github.com/coreos/etcd/pkg/testutil/leak.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/testutil/pauseable_handler.go b/vendor/github.com/coreos/etcd/pkg/testutil/pauseable_handler.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/testutil/pauseable_handler.go
rename to vendor/github.com/coreos/etcd/pkg/testutil/pauseable_handler.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/testutil/recorder.go b/vendor/github.com/coreos/etcd/pkg/testutil/recorder.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/testutil/recorder.go
rename to vendor/github.com/coreos/etcd/pkg/testutil/recorder.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/testutil/testutil.go b/vendor/github.com/coreos/etcd/pkg/testutil/testutil.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/testutil/testutil.go
rename to vendor/github.com/coreos/etcd/pkg/testutil/testutil.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/tlsutil/tlsutil.go b/vendor/github.com/coreos/etcd/pkg/tlsutil/tlsutil.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/tlsutil/tlsutil.go
rename to vendor/github.com/coreos/etcd/pkg/tlsutil/tlsutil.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/doc.go b/vendor/github.com/coreos/etcd/pkg/transport/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/doc.go
rename to vendor/github.com/coreos/etcd/pkg/transport/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/keepalive_listener.go b/vendor/github.com/coreos/etcd/pkg/transport/keepalive_listener.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/keepalive_listener.go
rename to vendor/github.com/coreos/etcd/pkg/transport/keepalive_listener.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/limit_listen.go b/vendor/github.com/coreos/etcd/pkg/transport/limit_listen.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/limit_listen.go
rename to vendor/github.com/coreos/etcd/pkg/transport/limit_listen.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/listener.go b/vendor/github.com/coreos/etcd/pkg/transport/listener.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/listener.go
rename to vendor/github.com/coreos/etcd/pkg/transport/listener.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_conn.go b/vendor/github.com/coreos/etcd/pkg/transport/timeout_conn.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_conn.go
rename to vendor/github.com/coreos/etcd/pkg/transport/timeout_conn.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_dialer.go b/vendor/github.com/coreos/etcd/pkg/transport/timeout_dialer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_dialer.go
rename to vendor/github.com/coreos/etcd/pkg/transport/timeout_dialer.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_listener.go b/vendor/github.com/coreos/etcd/pkg/transport/timeout_listener.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_listener.go
rename to vendor/github.com/coreos/etcd/pkg/transport/timeout_listener.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_transport.go b/vendor/github.com/coreos/etcd/pkg/transport/timeout_transport.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport/timeout_transport.go
rename to vendor/github.com/coreos/etcd/pkg/transport/timeout_transport.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/doc.go b/vendor/github.com/coreos/etcd/pkg/types/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/doc.go
rename to vendor/github.com/coreos/etcd/pkg/types/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/id.go b/vendor/github.com/coreos/etcd/pkg/types/id.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/id.go
rename to vendor/github.com/coreos/etcd/pkg/types/id.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/set.go b/vendor/github.com/coreos/etcd/pkg/types/set.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/set.go
rename to vendor/github.com/coreos/etcd/pkg/types/set.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/slice.go b/vendor/github.com/coreos/etcd/pkg/types/slice.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/slice.go
rename to vendor/github.com/coreos/etcd/pkg/types/slice.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/urls.go b/vendor/github.com/coreos/etcd/pkg/types/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/urls.go
rename to vendor/github.com/coreos/etcd/pkg/types/urls.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/urlsmap.go b/vendor/github.com/coreos/etcd/pkg/types/urlsmap.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/types/urlsmap.go
rename to vendor/github.com/coreos/etcd/pkg/types/urlsmap.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/wait/wait.go b/vendor/github.com/coreos/etcd/pkg/wait/wait.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/wait/wait.go
rename to vendor/github.com/coreos/etcd/pkg/wait/wait.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/pkg/wait/wait_time.go b/vendor/github.com/coreos/etcd/pkg/wait/wait_time.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/pkg/wait/wait_time.go
rename to vendor/github.com/coreos/etcd/pkg/wait/wait_time.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/design.md b/vendor/github.com/coreos/etcd/raft/design.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/design.md
rename to vendor/github.com/coreos/etcd/raft/design.md
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/doc.go b/vendor/github.com/coreos/etcd/raft/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/doc.go
rename to vendor/github.com/coreos/etcd/raft/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/log.go b/vendor/github.com/coreos/etcd/raft/log.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/log.go
rename to vendor/github.com/coreos/etcd/raft/log.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/log_unstable.go b/vendor/github.com/coreos/etcd/raft/log_unstable.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/log_unstable.go
rename to vendor/github.com/coreos/etcd/raft/log_unstable.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/logger.go b/vendor/github.com/coreos/etcd/raft/logger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/logger.go
rename to vendor/github.com/coreos/etcd/raft/logger.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/node.go b/vendor/github.com/coreos/etcd/raft/node.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/node.go
rename to vendor/github.com/coreos/etcd/raft/node.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/progress.go b/vendor/github.com/coreos/etcd/raft/progress.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/progress.go
rename to vendor/github.com/coreos/etcd/raft/progress.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/raft.go b/vendor/github.com/coreos/etcd/raft/raft.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/raft.go
rename to vendor/github.com/coreos/etcd/raft/raft.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/raftpb/raft.pb.go b/vendor/github.com/coreos/etcd/raft/raftpb/raft.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/raftpb/raft.pb.go
rename to vendor/github.com/coreos/etcd/raft/raftpb/raft.pb.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/raftpb/raft.proto b/vendor/github.com/coreos/etcd/raft/raftpb/raft.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/raftpb/raft.proto
rename to vendor/github.com/coreos/etcd/raft/raftpb/raft.proto
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/rafttest/doc.go b/vendor/github.com/coreos/etcd/raft/rafttest/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/rafttest/doc.go
rename to vendor/github.com/coreos/etcd/raft/rafttest/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/rafttest/network.go b/vendor/github.com/coreos/etcd/raft/rafttest/network.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/rafttest/network.go
rename to vendor/github.com/coreos/etcd/raft/rafttest/network.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/rafttest/node.go b/vendor/github.com/coreos/etcd/raft/rafttest/node.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/rafttest/node.go
rename to vendor/github.com/coreos/etcd/raft/rafttest/node.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/rawnode.go b/vendor/github.com/coreos/etcd/raft/rawnode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/rawnode.go
rename to vendor/github.com/coreos/etcd/raft/rawnode.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/status.go b/vendor/github.com/coreos/etcd/raft/status.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/status.go
rename to vendor/github.com/coreos/etcd/raft/status.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/storage.go b/vendor/github.com/coreos/etcd/raft/storage.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/storage.go
rename to vendor/github.com/coreos/etcd/raft/storage.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/raft/util.go b/vendor/github.com/coreos/etcd/raft/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/raft/util.go
rename to vendor/github.com/coreos/etcd/raft/util.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/coder.go b/vendor/github.com/coreos/etcd/rafthttp/coder.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/coder.go
rename to vendor/github.com/coreos/etcd/rafthttp/coder.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/doc.go b/vendor/github.com/coreos/etcd/rafthttp/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/doc.go
rename to vendor/github.com/coreos/etcd/rafthttp/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/http.go b/vendor/github.com/coreos/etcd/rafthttp/http.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/http.go
rename to vendor/github.com/coreos/etcd/rafthttp/http.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/metrics.go b/vendor/github.com/coreos/etcd/rafthttp/metrics.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/metrics.go
rename to vendor/github.com/coreos/etcd/rafthttp/metrics.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/msg_codec.go b/vendor/github.com/coreos/etcd/rafthttp/msg_codec.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/msg_codec.go
rename to vendor/github.com/coreos/etcd/rafthttp/msg_codec.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/msgappv2_codec.go b/vendor/github.com/coreos/etcd/rafthttp/msgappv2_codec.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/msgappv2_codec.go
rename to vendor/github.com/coreos/etcd/rafthttp/msgappv2_codec.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/peer.go b/vendor/github.com/coreos/etcd/rafthttp/peer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/peer.go
rename to vendor/github.com/coreos/etcd/rafthttp/peer.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/peer_status.go b/vendor/github.com/coreos/etcd/rafthttp/peer_status.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/peer_status.go
rename to vendor/github.com/coreos/etcd/rafthttp/peer_status.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/pipeline.go b/vendor/github.com/coreos/etcd/rafthttp/pipeline.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/pipeline.go
rename to vendor/github.com/coreos/etcd/rafthttp/pipeline.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/probing_status.go b/vendor/github.com/coreos/etcd/rafthttp/probing_status.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/probing_status.go
rename to vendor/github.com/coreos/etcd/rafthttp/probing_status.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/remote.go b/vendor/github.com/coreos/etcd/rafthttp/remote.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/remote.go
rename to vendor/github.com/coreos/etcd/rafthttp/remote.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/snapshot_sender.go b/vendor/github.com/coreos/etcd/rafthttp/snapshot_sender.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/snapshot_sender.go
rename to vendor/github.com/coreos/etcd/rafthttp/snapshot_sender.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/stream.go b/vendor/github.com/coreos/etcd/rafthttp/stream.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/stream.go
rename to vendor/github.com/coreos/etcd/rafthttp/stream.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/transport.go b/vendor/github.com/coreos/etcd/rafthttp/transport.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/transport.go
rename to vendor/github.com/coreos/etcd/rafthttp/transport.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/urlpick.go b/vendor/github.com/coreos/etcd/rafthttp/urlpick.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/urlpick.go
rename to vendor/github.com/coreos/etcd/rafthttp/urlpick.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/util.go b/vendor/github.com/coreos/etcd/rafthttp/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/rafthttp/util.go
rename to vendor/github.com/coreos/etcd/rafthttp/util.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/snap/db.go b/vendor/github.com/coreos/etcd/snap/db.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/snap/db.go
rename to vendor/github.com/coreos/etcd/snap/db.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/snap/message.go b/vendor/github.com/coreos/etcd/snap/message.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/snap/message.go
rename to vendor/github.com/coreos/etcd/snap/message.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/snap/metrics.go b/vendor/github.com/coreos/etcd/snap/metrics.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/snap/metrics.go
rename to vendor/github.com/coreos/etcd/snap/metrics.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/snap/snappb/snap.pb.go b/vendor/github.com/coreos/etcd/snap/snappb/snap.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/snap/snappb/snap.pb.go
rename to vendor/github.com/coreos/etcd/snap/snappb/snap.pb.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/snap/snappb/snap.proto b/vendor/github.com/coreos/etcd/snap/snappb/snap.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/snap/snappb/snap.proto
rename to vendor/github.com/coreos/etcd/snap/snappb/snap.proto
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/snap/snapshotter.go b/vendor/github.com/coreos/etcd/snap/snapshotter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/snap/snapshotter.go
rename to vendor/github.com/coreos/etcd/snap/snapshotter.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/backend.go b/vendor/github.com/coreos/etcd/storage/backend/backend.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/backend.go
rename to vendor/github.com/coreos/etcd/storage/backend/backend.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/batch_tx.go b/vendor/github.com/coreos/etcd/storage/backend/batch_tx.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/batch_tx.go
rename to vendor/github.com/coreos/etcd/storage/backend/batch_tx.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/boltoption_darwin.go b/vendor/github.com/coreos/etcd/storage/backend/boltoption_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/boltoption_darwin.go
rename to vendor/github.com/coreos/etcd/storage/backend/boltoption_darwin.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/boltoption_freebsd.go b/vendor/github.com/coreos/etcd/storage/backend/boltoption_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/boltoption_freebsd.go
rename to vendor/github.com/coreos/etcd/storage/backend/boltoption_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/boltoption_solaris.go b/vendor/github.com/coreos/etcd/storage/backend/boltoption_solaris.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/boltoption_solaris.go
rename to vendor/github.com/coreos/etcd/storage/backend/boltoption_solaris.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/boltoption_unix.go b/vendor/github.com/coreos/etcd/storage/backend/boltoption_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/boltoption_unix.go
rename to vendor/github.com/coreos/etcd/storage/backend/boltoption_unix.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/boltoption_windows.go b/vendor/github.com/coreos/etcd/storage/backend/boltoption_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/boltoption_windows.go
rename to vendor/github.com/coreos/etcd/storage/backend/boltoption_windows.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/doc.go b/vendor/github.com/coreos/etcd/storage/backend/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/backend/doc.go
rename to vendor/github.com/coreos/etcd/storage/backend/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/doc.go b/vendor/github.com/coreos/etcd/storage/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/doc.go
rename to vendor/github.com/coreos/etcd/storage/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/index.go b/vendor/github.com/coreos/etcd/storage/index.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/index.go
rename to vendor/github.com/coreos/etcd/storage/index.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/key_index.go b/vendor/github.com/coreos/etcd/storage/key_index.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/key_index.go
rename to vendor/github.com/coreos/etcd/storage/key_index.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/kv.go b/vendor/github.com/coreos/etcd/storage/kv.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/kv.go
rename to vendor/github.com/coreos/etcd/storage/kv.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/kvstore.go b/vendor/github.com/coreos/etcd/storage/kvstore.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/kvstore.go
rename to vendor/github.com/coreos/etcd/storage/kvstore.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/kvstore_compaction.go b/vendor/github.com/coreos/etcd/storage/kvstore_compaction.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/kvstore_compaction.go
rename to vendor/github.com/coreos/etcd/storage/kvstore_compaction.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/metrics.go b/vendor/github.com/coreos/etcd/storage/metrics.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/metrics.go
rename to vendor/github.com/coreos/etcd/storage/metrics.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/revision.go b/vendor/github.com/coreos/etcd/storage/revision.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/revision.go
rename to vendor/github.com/coreos/etcd/storage/revision.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/storagepb/kv.pb.go b/vendor/github.com/coreos/etcd/storage/storagepb/kv.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/storagepb/kv.pb.go
rename to vendor/github.com/coreos/etcd/storage/storagepb/kv.pb.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/storagepb/kv.proto b/vendor/github.com/coreos/etcd/storage/storagepb/kv.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/storagepb/kv.proto
rename to vendor/github.com/coreos/etcd/storage/storagepb/kv.proto
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/watchable_store.go b/vendor/github.com/coreos/etcd/storage/watchable_store.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/watchable_store.go
rename to vendor/github.com/coreos/etcd/storage/watchable_store.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/watcher.go b/vendor/github.com/coreos/etcd/storage/watcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/watcher.go
rename to vendor/github.com/coreos/etcd/storage/watcher.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/storage/watcher_group.go b/vendor/github.com/coreos/etcd/storage/watcher_group.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/storage/watcher_group.go
rename to vendor/github.com/coreos/etcd/storage/watcher_group.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/store/doc.go b/vendor/github.com/coreos/etcd/store/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/store/doc.go
rename to vendor/github.com/coreos/etcd/store/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/store/event.go b/vendor/github.com/coreos/etcd/store/event.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/store/event.go
rename to vendor/github.com/coreos/etcd/store/event.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/store/event_history.go b/vendor/github.com/coreos/etcd/store/event_history.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/store/event_history.go
rename to vendor/github.com/coreos/etcd/store/event_history.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/store/event_queue.go b/vendor/github.com/coreos/etcd/store/event_queue.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/store/event_queue.go
rename to vendor/github.com/coreos/etcd/store/event_queue.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/store/metrics.go b/vendor/github.com/coreos/etcd/store/metrics.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/store/metrics.go
rename to vendor/github.com/coreos/etcd/store/metrics.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/store/node.go b/vendor/github.com/coreos/etcd/store/node.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/store/node.go
rename to vendor/github.com/coreos/etcd/store/node.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/store/node_extern.go b/vendor/github.com/coreos/etcd/store/node_extern.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/store/node_extern.go
rename to vendor/github.com/coreos/etcd/store/node_extern.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/store/stats.go b/vendor/github.com/coreos/etcd/store/stats.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/store/stats.go
rename to vendor/github.com/coreos/etcd/store/stats.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/store/store.go b/vendor/github.com/coreos/etcd/store/store.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/store/store.go
rename to vendor/github.com/coreos/etcd/store/store.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/store/ttl_key_heap.go b/vendor/github.com/coreos/etcd/store/ttl_key_heap.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/store/ttl_key_heap.go
rename to vendor/github.com/coreos/etcd/store/ttl_key_heap.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/store/watcher.go b/vendor/github.com/coreos/etcd/store/watcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/store/watcher.go
rename to vendor/github.com/coreos/etcd/store/watcher.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/store/watcher_hub.go b/vendor/github.com/coreos/etcd/store/watcher_hub.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/store/watcher_hub.go
rename to vendor/github.com/coreos/etcd/store/watcher_hub.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/version/version.go b/vendor/github.com/coreos/etcd/version/version.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/version/version.go
rename to vendor/github.com/coreos/etcd/version/version.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/wal/decoder.go b/vendor/github.com/coreos/etcd/wal/decoder.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/wal/decoder.go
rename to vendor/github.com/coreos/etcd/wal/decoder.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/wal/doc.go b/vendor/github.com/coreos/etcd/wal/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/wal/doc.go
rename to vendor/github.com/coreos/etcd/wal/doc.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/wal/encoder.go b/vendor/github.com/coreos/etcd/wal/encoder.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/wal/encoder.go
rename to vendor/github.com/coreos/etcd/wal/encoder.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/wal/file_pipeline.go b/vendor/github.com/coreos/etcd/wal/file_pipeline.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/wal/file_pipeline.go
rename to vendor/github.com/coreos/etcd/wal/file_pipeline.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/wal/metrics.go b/vendor/github.com/coreos/etcd/wal/metrics.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/wal/metrics.go
rename to vendor/github.com/coreos/etcd/wal/metrics.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/wal/repair.go b/vendor/github.com/coreos/etcd/wal/repair.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/wal/repair.go
rename to vendor/github.com/coreos/etcd/wal/repair.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/wal/util.go b/vendor/github.com/coreos/etcd/wal/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/wal/util.go
rename to vendor/github.com/coreos/etcd/wal/util.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/wal/wal.go b/vendor/github.com/coreos/etcd/wal/wal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/wal/wal.go
rename to vendor/github.com/coreos/etcd/wal/wal.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/wal/walpb/record.go b/vendor/github.com/coreos/etcd/wal/walpb/record.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/wal/walpb/record.go
rename to vendor/github.com/coreos/etcd/wal/walpb/record.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/wal/walpb/record.pb.go b/vendor/github.com/coreos/etcd/wal/walpb/record.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/wal/walpb/record.pb.go
rename to vendor/github.com/coreos/etcd/wal/walpb/record.pb.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/wal/walpb/record.proto b/vendor/github.com/coreos/etcd/wal/walpb/record.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/wal/walpb/record.proto
rename to vendor/github.com/coreos/etcd/wal/walpb/record.proto
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/cockroachdb/cmux/LICENSE b/vendor/github.com/coreos/go-etcd/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/cockroachdb/cmux/LICENSE
rename to vendor/github.com/coreos/go-etcd/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child.go b/vendor/github.com/coreos/go-etcd/etcd/add_child.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child.go
rename to vendor/github.com/coreos/go-etcd/etcd/add_child.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/client.go b/vendor/github.com/coreos/go-etcd/etcd/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/client.go
rename to vendor/github.com/coreos/go-etcd/etcd/client.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/cluster.go b/vendor/github.com/coreos/go-etcd/etcd/cluster.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/cluster.go
rename to vendor/github.com/coreos/go-etcd/etcd/cluster.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_delete.go b/vendor/github.com/coreos/go-etcd/etcd/compare_and_delete.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_delete.go
rename to vendor/github.com/coreos/go-etcd/etcd/compare_and_delete.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_swap.go b/vendor/github.com/coreos/go-etcd/etcd/compare_and_swap.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/compare_and_swap.go
rename to vendor/github.com/coreos/go-etcd/etcd/compare_and_swap.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/debug.go b/vendor/github.com/coreos/go-etcd/etcd/debug.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/debug.go
rename to vendor/github.com/coreos/go-etcd/etcd/debug.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/delete.go b/vendor/github.com/coreos/go-etcd/etcd/delete.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/delete.go
rename to vendor/github.com/coreos/go-etcd/etcd/delete.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/error.go b/vendor/github.com/coreos/go-etcd/etcd/error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/error.go
rename to vendor/github.com/coreos/go-etcd/etcd/error.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/get.go b/vendor/github.com/coreos/go-etcd/etcd/get.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/get.go
rename to vendor/github.com/coreos/go-etcd/etcd/get.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/member.go b/vendor/github.com/coreos/go-etcd/etcd/member.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/member.go
rename to vendor/github.com/coreos/go-etcd/etcd/member.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/options.go b/vendor/github.com/coreos/go-etcd/etcd/options.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/options.go
rename to vendor/github.com/coreos/go-etcd/etcd/options.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/requests.go b/vendor/github.com/coreos/go-etcd/etcd/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/requests.go
rename to vendor/github.com/coreos/go-etcd/etcd/requests.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/response.generated.go b/vendor/github.com/coreos/go-etcd/etcd/response.generated.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/response.generated.go
rename to vendor/github.com/coreos/go-etcd/etcd/response.generated.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/response.go b/vendor/github.com/coreos/go-etcd/etcd/response.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/response.go
rename to vendor/github.com/coreos/go-etcd/etcd/response.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_update_create.go b/vendor/github.com/coreos/go-etcd/etcd/set_update_create.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/set_update_create.go
rename to vendor/github.com/coreos/go-etcd/etcd/set_update_create.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/shuffle.go b/vendor/github.com/coreos/go-etcd/etcd/shuffle.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/shuffle.go
rename to vendor/github.com/coreos/go-etcd/etcd/shuffle.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/version.go b/vendor/github.com/coreos/go-etcd/etcd/version.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/version.go
rename to vendor/github.com/coreos/go-etcd/etcd/version.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/watch.go b/vendor/github.com/coreos/go-etcd/etcd/watch.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/watch.go
rename to vendor/github.com/coreos/go-etcd/etcd/watch.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/coreos/pkg/LICENSE b/vendor/github.com/coreos/go-oidc/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/coreos/pkg/LICENSE
rename to vendor/github.com/coreos/go-oidc/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/coreos/pkg/NOTICE b/vendor/github.com/coreos/go-oidc/NOTICE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/coreos/pkg/NOTICE
rename to vendor/github.com/coreos/go-oidc/NOTICE
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/http/client.go b/vendor/github.com/coreos/go-oidc/http/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/http/client.go
rename to vendor/github.com/coreos/go-oidc/http/client.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/http/http.go b/vendor/github.com/coreos/go-oidc/http/http.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/http/http.go
rename to vendor/github.com/coreos/go-oidc/http/http.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/http/middleware.go b/vendor/github.com/coreos/go-oidc/http/middleware.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/http/middleware.go
rename to vendor/github.com/coreos/go-oidc/http/middleware.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/http/url.go b/vendor/github.com/coreos/go-oidc/http/url.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/http/url.go
rename to vendor/github.com/coreos/go-oidc/http/url.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/claims.go b/vendor/github.com/coreos/go-oidc/jose/claims.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/jose/claims.go
rename to vendor/github.com/coreos/go-oidc/jose/claims.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jose.go b/vendor/github.com/coreos/go-oidc/jose/jose.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jose.go
rename to vendor/github.com/coreos/go-oidc/jose/jose.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwk.go b/vendor/github.com/coreos/go-oidc/jose/jwk.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwk.go
rename to vendor/github.com/coreos/go-oidc/jose/jwk.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jws.go b/vendor/github.com/coreos/go-oidc/jose/jws.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jws.go
rename to vendor/github.com/coreos/go-oidc/jose/jws.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwt.go b/vendor/github.com/coreos/go-oidc/jose/jwt.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwt.go
rename to vendor/github.com/coreos/go-oidc/jose/jwt.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig.go b/vendor/github.com/coreos/go-oidc/jose/sig.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig.go
rename to vendor/github.com/coreos/go-oidc/jose/sig.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig_hmac.go b/vendor/github.com/coreos/go-oidc/jose/sig_hmac.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig_hmac.go
rename to vendor/github.com/coreos/go-oidc/jose/sig_hmac.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig_rsa.go b/vendor/github.com/coreos/go-oidc/jose/sig_rsa.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig_rsa.go
rename to vendor/github.com/coreos/go-oidc/jose/sig_rsa.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/key/key.go b/vendor/github.com/coreos/go-oidc/key/key.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/key/key.go
rename to vendor/github.com/coreos/go-oidc/key/key.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/key/manager.go b/vendor/github.com/coreos/go-oidc/key/manager.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/key/manager.go
rename to vendor/github.com/coreos/go-oidc/key/manager.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/key/repo.go b/vendor/github.com/coreos/go-oidc/key/repo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/key/repo.go
rename to vendor/github.com/coreos/go-oidc/key/repo.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/key/rotate.go b/vendor/github.com/coreos/go-oidc/key/rotate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/key/rotate.go
rename to vendor/github.com/coreos/go-oidc/key/rotate.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/key/sync.go b/vendor/github.com/coreos/go-oidc/key/sync.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/key/sync.go
rename to vendor/github.com/coreos/go-oidc/key/sync.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/error.go b/vendor/github.com/coreos/go-oidc/oauth2/error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/error.go
rename to vendor/github.com/coreos/go-oidc/oauth2/error.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/oauth2.go b/vendor/github.com/coreos/go-oidc/oauth2/oauth2.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/oauth2.go
rename to vendor/github.com/coreos/go-oidc/oauth2/oauth2.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/client.go b/vendor/github.com/coreos/go-oidc/oidc/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/client.go
rename to vendor/github.com/coreos/go-oidc/oidc/client.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/identity.go b/vendor/github.com/coreos/go-oidc/oidc/identity.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/identity.go
rename to vendor/github.com/coreos/go-oidc/oidc/identity.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/interface.go b/vendor/github.com/coreos/go-oidc/oidc/interface.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/interface.go
rename to vendor/github.com/coreos/go-oidc/oidc/interface.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/key.go b/vendor/github.com/coreos/go-oidc/oidc/key.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/key.go
rename to vendor/github.com/coreos/go-oidc/oidc/key.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/provider.go b/vendor/github.com/coreos/go-oidc/oidc/provider.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/provider.go
rename to vendor/github.com/coreos/go-oidc/oidc/provider.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/transport.go b/vendor/github.com/coreos/go-oidc/oidc/transport.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/transport.go
rename to vendor/github.com/coreos/go-oidc/oidc/transport.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/util.go b/vendor/github.com/coreos/go-oidc/oidc/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/util.go
rename to vendor/github.com/coreos/go-oidc/oidc/util.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/verification.go b/vendor/github.com/coreos/go-oidc/oidc/verification.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/verification.go
rename to vendor/github.com/coreos/go-oidc/oidc/verification.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/coreos/go-semver/LICENSE b/vendor/github.com/coreos/go-semver/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/coreos/go-semver/LICENSE
rename to vendor/github.com/coreos/go-semver/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/go-semver/semver/semver.go b/vendor/github.com/coreos/go-semver/semver/semver.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-semver/semver/semver.go
rename to vendor/github.com/coreos/go-semver/semver/semver.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-semver/semver/sort.go b/vendor/github.com/coreos/go-semver/semver/sort.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-semver/semver/sort.go
rename to vendor/github.com/coreos/go-semver/semver/sort.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/vendor/github.com/go-ini/ini/LICENSE b/vendor/github.com/coreos/go-systemd/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/vendor/github.com/go-ini/ini/LICENSE
rename to vendor/github.com/coreos/go-systemd/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/daemon/sdnotify.go b/vendor/github.com/coreos/go-systemd/daemon/sdnotify.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/daemon/sdnotify.go
rename to vendor/github.com/coreos/go-systemd/daemon/sdnotify.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go b/vendor/github.com/coreos/go-systemd/dbus/dbus.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go
rename to vendor/github.com/coreos/go-systemd/dbus/dbus.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go b/vendor/github.com/coreos/go-systemd/dbus/methods.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go
rename to vendor/github.com/coreos/go-systemd/dbus/methods.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/properties.go b/vendor/github.com/coreos/go-systemd/dbus/properties.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/properties.go
rename to vendor/github.com/coreos/go-systemd/dbus/properties.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set.go b/vendor/github.com/coreos/go-systemd/dbus/set.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set.go
rename to vendor/github.com/coreos/go-systemd/dbus/set.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription.go b/vendor/github.com/coreos/go-systemd/dbus/subscription.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription.go
rename to vendor/github.com/coreos/go-systemd/dbus/subscription.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set.go b/vendor/github.com/coreos/go-systemd/dbus/subscription_set.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set.go
rename to vendor/github.com/coreos/go-systemd/dbus/subscription_set.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/deserialize.go b/vendor/github.com/coreos/go-systemd/unit/deserialize.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/unit/deserialize.go
rename to vendor/github.com/coreos/go-systemd/unit/deserialize.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/escape.go b/vendor/github.com/coreos/go-systemd/unit/escape.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/unit/escape.go
rename to vendor/github.com/coreos/go-systemd/unit/escape.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/option.go b/vendor/github.com/coreos/go-systemd/unit/option.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/unit/option.go
rename to vendor/github.com/coreos/go-systemd/unit/option.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/serialize.go b/vendor/github.com/coreos/go-systemd/unit/serialize.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/unit/serialize.go
rename to vendor/github.com/coreos/go-systemd/unit/serialize.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go b/vendor/github.com/coreos/go-systemd/util/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go
rename to vendor/github.com/coreos/go-systemd/util/util.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/LICENSE b/vendor/github.com/coreos/pkg/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/LICENSE
rename to vendor/github.com/coreos/pkg/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/NOTICE b/vendor/github.com/coreos/pkg/NOTICE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-oidc/NOTICE
rename to vendor/github.com/coreos/pkg/NOTICE
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/README.md b/vendor/github.com/coreos/pkg/capnslog/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/capnslog/README.md
rename to vendor/github.com/coreos/pkg/capnslog/README.md
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/example/hello_dolly.go b/vendor/github.com/coreos/pkg/capnslog/example/hello_dolly.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/capnslog/example/hello_dolly.go
rename to vendor/github.com/coreos/pkg/capnslog/example/hello_dolly.go
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/formatters.go b/vendor/github.com/coreos/pkg/capnslog/formatters.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/capnslog/formatters.go
rename to vendor/github.com/coreos/pkg/capnslog/formatters.go
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/glog_formatter.go b/vendor/github.com/coreos/pkg/capnslog/glog_formatter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/capnslog/glog_formatter.go
rename to vendor/github.com/coreos/pkg/capnslog/glog_formatter.go
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/log_hijack.go b/vendor/github.com/coreos/pkg/capnslog/log_hijack.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/capnslog/log_hijack.go
rename to vendor/github.com/coreos/pkg/capnslog/log_hijack.go
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/logmap.go b/vendor/github.com/coreos/pkg/capnslog/logmap.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/capnslog/logmap.go
rename to vendor/github.com/coreos/pkg/capnslog/logmap.go
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/pkg_logger.go b/vendor/github.com/coreos/pkg/capnslog/pkg_logger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/capnslog/pkg_logger.go
rename to vendor/github.com/coreos/pkg/capnslog/pkg_logger.go
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/syslog_formatter.go b/vendor/github.com/coreos/pkg/capnslog/syslog_formatter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/capnslog/syslog_formatter.go
rename to vendor/github.com/coreos/pkg/capnslog/syslog_formatter.go
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/health/README.md b/vendor/github.com/coreos/pkg/health/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/health/README.md
rename to vendor/github.com/coreos/pkg/health/README.md
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/health/health.go b/vendor/github.com/coreos/pkg/health/health.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/health/health.go
rename to vendor/github.com/coreos/pkg/health/health.go
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/httputil/README.md b/vendor/github.com/coreos/pkg/httputil/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/httputil/README.md
rename to vendor/github.com/coreos/pkg/httputil/README.md
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/httputil/json.go b/vendor/github.com/coreos/pkg/httputil/json.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/httputil/json.go
rename to vendor/github.com/coreos/pkg/httputil/json.go
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/timeutil/backoff.go b/vendor/github.com/coreos/pkg/timeutil/backoff.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/timeutil/backoff.go
rename to vendor/github.com/coreos/pkg/timeutil/backoff.go
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/cni/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/cni/LICENSE
new file mode 100644
index 0000000000..8f71f43fee
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/cni/LICENSE
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/docker2aci/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/pkg/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/docker2aci/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/goaci/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/goaci/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/docker/distribution/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/docker/distribution/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/google/btree/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/COPYING
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/google/btree/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/COPYING
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/clients/chrome/clip-it-good/LICENSE
similarity index 93%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/clients/chrome/clip-it-good/LICENSE
index b03310a91f..055361b34f 100644
--- a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/clients/chrome/clip-it-good/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2015 James Saryerwinnie
+Copyright 2010 Brett Slatkin
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/misc/copyrightifity b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/misc/copyrightifity
new file mode 100644
index 0000000000..14db513c88
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/misc/copyrightifity
@@ -0,0 +1,68 @@
+#!/usr/bin/perl
+#
+# Copyright 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+# This script adds copyright headers to files.
+
+use strict;
+my $header = do { local $/; <DATA> };
+$header =~ s!\s+$!\n!;
+my $yyyy = (localtime())[5] + 1900;
+$header =~ s/YYYY/$yyyy/ or die;
+
+unless (@ARGV == 1) {
+    die "Usage: copyrightify <filename>\n";
+}
+
+my $file = shift;
+open(my $fh, $file) or die "Open $file error: $!\n";
+my $source = do { local $/; <$fh> };
+close($fh);
+if ($source =~ /Copyright \d\d\d\d/) {
+   print STDERR "# $file - OK\n";
+   exit;
+}
+
+my $newsource = $source;
+if ($file =~ /\.(go|java|aidl)$/) {
+    $header = "/*\n$header*/\n\n";
+    $newsource = $header . $source;
+} elsif ($file =~ /\.py$/) {
+    $header = join("", map { "# $_\n" } split(/\n/, $header));
+    $newsource = $header . $source;
+} else {
+    die "File type not supported.";
+}
+
+
+open(my $fh, ">$file") or die "Open $file error: $!\n";
+print $fh $newsource;
+close($fh) or die;
+
+__END__
+Copyright YYYY The Camlistore Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/legal/legal.go b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/legal/legal.go
new file mode 100644
index 0000000000..a75283fd6b
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/legal/legal.go
@@ -0,0 +1,50 @@
+/*
+Copyright 2014 The Camlistore Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package legal provides project-wide storage for compiled-in licenses.
+package legal
+
+var licenses []string
+
+func init() {
+	RegisterLicense(`
+Copyright 2014 The Camlistore Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+`)
+}
+
+// RegisterLicense stores the license text.
+// It doesn't check whether the text was already present.
+func RegisterLicense(text string) {
+	licenses = append(licenses, text)
+	return
+}
+
+// Licenses returns a slice of the licenses.
+func Licenses() []string {
+	return licenses
+}
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/legal/legalprint/legalprint.go b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/legal/legalprint/legalprint.go
new file mode 100644
index 0000000000..e4a3205a6a
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/legal/legalprint/legalprint.go
@@ -0,0 +1,42 @@
+/*
+Copyright 2014 The Camlistore Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package legalprint provides a printing helper for the legal package.
+package legalprint
+
+import (
+	"flag"
+	"fmt"
+	"io"
+
+	"camlistore.org/pkg/legal"
+)
+
+var (
+	flagLegal = flag.Bool("legal", false, "show licenses")
+)
+
+// MaybePrint will print the licenses if flagLegal has been set.
+// It will return the value of the flagLegal.
+func MaybePrint(out io.Writer) bool {
+	if !*flagLegal {
+		return false
+	}
+	for _, text := range legal.Licenses() {
+		fmt.Fprintln(out, text)
+	}
+	return true
+}
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/bazil.org/fuse/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/bazil.org/fuse/LICENSE
new file mode 100644
index 0000000000..d369cb822a
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/bazil.org/fuse/LICENSE
@@ -0,0 +1,93 @@
+Copyright (c) 2013, 2014 Tommi Virtanen.
+Copyright (c) 2009, 2011, 2012 The Go Authors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+The following included software components have additional copyright
+notices and license terms that may differ from the above.
+
+
+File fuse.go:
+
+// Adapted from Plan 9 from User Space's src/cmd/9pfuse/fuse.c,
+// which carries this notice:
+//
+// The files in this directory are subject to the following license.
+//
+// The author of this software is Russ Cox.
+//
+//         Copyright (c) 2006 Russ Cox
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose without fee is hereby granted, provided that this entire notice
+// is included in all copies of any software which is or includes a copy
+// or modification of this software and in all copies of the supporting
+// documentation for such software.
+//
+// THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+// WARRANTY.  IN PARTICULAR, THE AUTHOR MAKES NO REPRESENTATION OR WARRANTY
+// OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS SOFTWARE OR ITS
+// FITNESS FOR ANY PARTICULAR PURPOSE.
+
+
+File fuse_kernel.go:
+
+// Derived from FUSE's fuse_kernel.h
+/*
+   This file defines the kernel interface of FUSE
+   Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
+
+
+   This -- and only this -- header file may also be distributed under
+   the terms of the BSD Licence as follows:
+
+   Copyright (C) 2001-2007 Miklos Szeredi. All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+*/
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/closure/lib/LICENSE
similarity index 99%
rename from Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/closure/lib/LICENSE
index 298f0e2665..d9a10c0d8e 100644
--- a/Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/closure/lib/LICENSE
@@ -1,4 +1,4 @@
-                                Apache License
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -172,3 +172,5 @@
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/akrennmair/gopcap/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/goauth2/LICENSE
similarity index 91%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/akrennmair/gopcap/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/goauth2/LICENSE
index 385fac9f26..6765f090b4 100644
--- a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/akrennmair/gopcap/LICENSE
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/goauth2/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2009-2011 Andreas Krennmair. All rights reserved.
+Copyright (c) 2009 The goauth2 Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-   * Neither the name of Andreas Krennmair nor the names of its
+   * Neither the name of Google Inc. nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/goauth2/PATENTS b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/goauth2/PATENTS
new file mode 100644
index 0000000000..9e8716353d
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/goauth2/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the goauth2 project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/leveldb-go/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/leveldb-go/LICENSE
new file mode 100644
index 0000000000..fec05ce129
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/leveldb-go/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2011 The LevelDB-Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/snappy-go/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/snappy-go/LICENSE
new file mode 100644
index 0000000000..6050c10f4c
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/snappy-go/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2011 The Snappy-Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/xsrftoken/COPYING
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-etcd/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/xsrftoken/COPYING
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/fontawesome/LICENSE.txt b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/fontawesome/LICENSE.txt
new file mode 100644
index 0000000000..1066d2f825
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/fontawesome/LICENSE.txt
@@ -0,0 +1,4 @@
+fonts/*: SIL OFL 1.1 (http://scripts.sil.org/OFL)
+css/*: MIT (http://opensource.org/licenses/mit-license.html)
+
+Details at http://fortawesome.github.io/Font-Awesome/license/
diff --git a/Godeps/_workspace/src/github.com/coreos/go-semver/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/camlistore/lock/COPYING
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-semver/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/camlistore/lock/COPYING
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/exp/dbm/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/exp/dbm/LICENSE
new file mode 100644
index 0000000000..65d761bc9f
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/exp/dbm/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2013 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/exp/lldb/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/exp/lldb/LICENSE
new file mode 100644
index 0000000000..65d761bc9f
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/exp/lldb/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2013 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/LICENSE
new file mode 100644
index 0000000000..50bbdd2410
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The fileutil Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/yvasiyarov/newrelic_platform_go/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/falloc/LICENSE
similarity index 84%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/yvasiyarov/newrelic_platform_go/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/falloc/LICENSE
index 01a9a5c4d1..1e92e33dd7 100644
--- a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/yvasiyarov/newrelic_platform_go/LICENSE
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/falloc/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013 Yuriy Vasiyarov. All rights reserved.
+Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10,6 +10,9 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
+   * Neither the name of CZ.NIC nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/hdb/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/hdb/LICENSE
new file mode 100644
index 0000000000..1e92e33dd7
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/hdb/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of CZ.NIC nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/storage/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/storage/LICENSE
new file mode 100644
index 0000000000..1e92e33dd7
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/storage/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of CZ.NIC nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/kv/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/kv/LICENSE
new file mode 100644
index 0000000000..65d761bc9f
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/kv/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2013 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/mathutil/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/mathutil/LICENSE
new file mode 100644
index 0000000000..1e92e33dd7
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/mathutil/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of CZ.NIC nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/yvasiyarov/gorelic/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/mathutil/mersenne/LICENSE
similarity index 84%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/yvasiyarov/gorelic/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/mathutil/mersenne/LICENSE
index 01a9a5c4d1..7150ce3e43 100644
--- a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/yvasiyarov/gorelic/LICENSE
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/mathutil/mersenne/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013 Yuriy Vasiyarov. All rights reserved.
+Copyright (c) 2011 jnml. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10,6 +10,9 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
+   * Neither the name of jnml nor the names of his
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/golang.org/x/net/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/sortutil/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/golang.org/x/net/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/sortutil/LICENSE
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/zappy/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/zappy/LICENSE
new file mode 100644
index 0000000000..65d761bc9f
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/zappy/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2013 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/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/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/davecgh/go-spew/LICENSE
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/go-sql-driver/mysql/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/go-sql-driver/mysql/LICENSE
new file mode 100644
index 0000000000..14e2f777f6
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/go-sql-driver/mysql/LICENSE
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/coreos/go-systemd/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/golang/glog/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/coreos/go-systemd/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/golang/glog/LICENSE
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/gorilla/websocket/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/gorilla/websocket/LICENSE
new file mode 100644
index 0000000000..09e5be61d7
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/gorilla/websocket/LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) 2013, Gorilla web toolkit
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+  Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+  Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/lib/pq/LICENSE.md b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/lib/pq/LICENSE.md
new file mode 100644
index 0000000000..5773904a30
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/lib/pq/LICENSE.md
@@ -0,0 +1,8 @@
+Copyright (c) 2011-2013, 'pq' Contributors
+Portions Copyright (C) 2011 Blake Mizerany
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/russross/blackfriday/LICENSE.txt b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/russross/blackfriday/LICENSE.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/russross/blackfriday/LICENSE.txt
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/russross/blackfriday/LICENSE.txt
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/rwcarlsen/goexif/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/rwcarlsen/goexif/LICENSE
new file mode 100644
index 0000000000..aa6250465f
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/rwcarlsen/goexif/LICENSE
@@ -0,0 +1,24 @@
+
+Copyright (c) 2012, Robert Carlsen & Contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/glitch/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/glitch/LICENSE
new file mode 100644
index 0000000000..7efba3b1c6
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/glitch/LICENSE
@@ -0,0 +1,19 @@
+The files in here come from www.glitchthegame.com.
+
+License here: http://www.glitchthegame.com/public-domain-game-art/#licensing
+
+All files are provided by Tiny Speck under the Creative Commons CC0 1.0
+Universal License. This is a broadly permissive "No Rights Reserved" license —
+you may do what you please with what we've provided. Our intention is to
+dedicate these works to the public domain and make them freely available to all,
+without restriction. All files are provided AS-IS. Tiny Speck cannot provide any
+support to help you bring these assets into your own projects.
+
+Note: the Glitch logo and trademark are not among the things we are making
+available under this license. Only items in the files explicitly included herein
+are covered.
+
+There is no obligation to link or credit the works, but if you do, please link
+to glitchthegame.com, our permanent "retirement" site for the game and these
+assets. Of course, links/shoutouts to Tiny Speck (tinyspeck.com) and/or Slack
+(slack.com) are appreciated.
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/golang.org/x/sys/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/golang.org/x/image/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/golang.org/x/sys/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/golang.org/x/image/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/golang.org/x/net/PATENTS b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/golang.org/x/image/PATENTS
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/golang.org/x/net/PATENTS
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/golang.org/x/image/PATENTS
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/go-check/check/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/labix.org/v2/mgo/LICENSE
similarity index 92%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/go-check/check/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/labix.org/v2/mgo/LICENSE
index 545cf2d331..770c7672b4 100644
--- a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/go-check/check/LICENSE
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/labix.org/v2/mgo/LICENSE
@@ -1,6 +1,6 @@
-Gocheck - A rich testing framework for Go
- 
-Copyright (c) 2010-2013 Gustavo Niemeyer <gustavo@niemeyer.net>
+mgo - MongoDB driver for Go
+
+Copyright (c) 2010-2013 - Gustavo Niemeyer <gustavo@niemeyer.net>
 
 All rights reserved.
 
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/gopkg.in/check.v1/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/labix.org/v2/mgo/bson/LICENSE
similarity index 92%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/gopkg.in/check.v1/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/labix.org/v2/mgo/bson/LICENSE
index 545cf2d331..890326017b 100644
--- a/Godeps/_workspace/src/github.com/docker/distribution/vendor/gopkg.in/check.v1/LICENSE
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/labix.org/v2/mgo/bson/LICENSE
@@ -1,6 +1,6 @@
-Gocheck - A rich testing framework for Go
- 
-Copyright (c) 2010-2013 Gustavo Niemeyer <gustavo@niemeyer.net>
+BSON library for Go
+
+Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
 
 All rights reserved.
 
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/client_golang/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/react/LICENSE.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/client_golang/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/react/LICENSE.txt
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/go4/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/go4/LICENSE
new file mode 100644
index 0000000000..8f71f43fee
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/go4/LICENSE
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/Godeps/_workspace/src/github.com/camlistore/go4/legal/legal.go b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/go4/legal/legal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/camlistore/go4/legal/legal.go
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/go4/legal/legal.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/natefinch/npipe/LICENSE.txt b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/gexpect/LICENCE
similarity index 93%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/natefinch/npipe/LICENSE.txt
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/gexpect/LICENCE
index a4a11046cc..50adb0f19c 100644
--- a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/natefinch/npipe/LICENSE.txt
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/gexpect/LICENCE
@@ -1,5 +1,4 @@
-The MIT License (MIT)
-Copyright (c) 2013 npipe authors
+Copyright (C) 2014 Thomas Rooney
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/golang/glog/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/go-iptables/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/golang/glog/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/go-iptables/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/Azure/azure-sdk-for-go/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/go-semver/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/Azure/azure-sdk-for-go/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/go-semver/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/go-systemd/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/go-systemd/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/go-systemd/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/docker/libnetwork/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/go-tspi/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/docker/libnetwork/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/go-tspi/LICENSE
diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/ioprogress/LICENSE
similarity index 96%
rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/ioprogress/LICENSE
index f9c841a51e..2298515904 100644
--- a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/LICENSE
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/ioprogress/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 Mitchell Hashimoto
+Copyright (c) 2014 Mitchell Hashimoto
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/cpuguy83/go-md2man/LICENSE.md b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cpuguy83/go-md2man/LICENSE.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/cpuguy83/go-md2man/LICENSE.md
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cpuguy83/go-md2man/LICENSE.md
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/b/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/b/LICENSE
new file mode 100644
index 0000000000..54c6e90872
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/b/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The b Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/bufs/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/bufs/LICENSE
new file mode 100644
index 0000000000..7d80fe28eb
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/bufs/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The bufs Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/exp/dbm/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/exp/dbm/LICENSE
new file mode 100644
index 0000000000..80c7ae7fa6
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/exp/dbm/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The dbm Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/exp/lldb/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/exp/lldb/LICENSE
new file mode 100644
index 0000000000..27e4447a49
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/exp/lldb/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The lldb Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/LICENSE
new file mode 100644
index 0000000000..50bbdd2410
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The fileutil Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/LICENSE
new file mode 100644
index 0000000000..1e92e33dd7
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of CZ.NIC nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/LICENSE
new file mode 100644
index 0000000000..1e92e33dd7
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of CZ.NIC nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/storage/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/storage/LICENSE
new file mode 100644
index 0000000000..1e92e33dd7
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/storage/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of CZ.NIC nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil/LICENSE
new file mode 100644
index 0000000000..128a1b64a4
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The mathutil Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/LICENSE
new file mode 100644
index 0000000000..4fa2a1f4fd
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The mersenne Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/ql/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/ql/LICENSE
new file mode 100644
index 0000000000..0d10c02b92
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/ql/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The ql Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/sortutil/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/sortutil/LICENSE
new file mode 100644
index 0000000000..67983e0e61
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/sortutil/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The sortutil Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/strutil/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/strutil/LICENSE
new file mode 100644
index 0000000000..2fdd92cf71
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/strutil/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The strutil Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/zappy/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/zappy/LICENSE
new file mode 100644
index 0000000000..bc67059c52
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/zappy/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The zappy Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/d2g/dhcp4/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/d2g/dhcp4/LICENSE
new file mode 100644
index 0000000000..f7d058a358
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/d2g/dhcp4/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2013 Skagerrak Software Limited. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Skagerrak Software Limited nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/d2g/dhcp4client/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/d2g/dhcp4client/LICENSE
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/docker/distribution/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/docker/distribution/LICENSE
new file mode 100644
index 0000000000..e06d208186
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/docker/distribution/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/dustin/go-humanize/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/dustin/go-humanize/LICENSE
new file mode 100644
index 0000000000..8d9a94a906
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/dustin/go-humanize/LICENSE
@@ -0,0 +1,21 @@
+Copyright (c) 2005-2008  Dustin Sallings <dustin@spy.net>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+<http://www.opensource.org/licenses/mit-license.php>
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/godbus/dbus/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/godbus/dbus/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/golang/protobuf/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/golang/protobuf/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/google.golang.org/appengine/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/google/btree/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/google.golang.org/appengine/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/google/btree/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/gorilla/context/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/gorilla/context/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/gorilla/context/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/gorilla/context/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/gorilla/mux/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/gorilla/mux/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/gorilla/mux/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/gorilla/mux/LICENSE
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/hashicorp/errwrap/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/hashicorp/errwrap/LICENSE
new file mode 100644
index 0000000000..c33dcc7c92
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/hashicorp/errwrap/LICENSE
@@ -0,0 +1,354 @@
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. “Contributor”
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. “Contributor Version”
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor’s Contribution.
+
+1.3. “Contribution”
+
+     means Covered Software of a particular Contributor.
+
+1.4. “Covered Software”
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. “Incompatible With Secondary Licenses”
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of version
+        1.1 or earlier of the License, but not also under the terms of a
+        Secondary License.
+
+1.6. “Executable Form”
+
+     means any form of the work other than Source Code Form.
+
+1.7. “Larger Work”
+
+     means a work that combines Covered Software with other material, in a separate
+     file or files, that is not Covered Software.
+
+1.8. “License”
+
+     means this document.
+
+1.9. “Licensable”
+
+     means having the right to grant, to the maximum extent possible, whether at the
+     time of the initial grant or subsequently, any and all of the rights conveyed by
+     this License.
+
+1.10. “Modifications”
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to, deletion
+        from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. “Patent Claims” of a Contributor
+
+      means any patent claim(s), including without limitation, method, process,
+      and apparatus claims, in any patent Licensable by such Contributor that
+      would be infringed, but for the grant of the License, by the making,
+      using, selling, offering for sale, having made, import, or transfer of
+      either its Contributions or its Contributor Version.
+
+1.12. “Secondary License”
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. “Source Code Form”
+
+      means the form of the work preferred for making modifications.
+
+1.14. “You” (or “Your”)
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, “You” includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, “control” means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or as
+        part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its Contributions
+        or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution become
+     effective for each Contribution on the date the Contributor first distributes
+     such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under this
+     License. No additional rights or licenses will be implied from the distribution
+     or licensing of Covered Software under this License. Notwithstanding Section
+     2.1(b) above, no patent license is granted by a Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party’s
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of its
+        Contributions.
+
+     This License does not grant any rights in the trademarks, service marks, or
+     logos of any Contributor (except as may be necessary to comply with the
+     notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this License
+     (see Section 10.2) or under the terms of a Secondary License (if permitted
+     under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its Contributions
+     are its original creation(s) or it has sufficient rights to grant the
+     rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under applicable
+     copyright doctrines of fair use, fair dealing, or other equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under the
+     terms of this License. You must inform recipients that the Source Code Form
+     of the Covered Software is governed by the terms of this License, and how
+     they can obtain a copy of this License. You may not attempt to alter or
+     restrict the recipients’ rights in the Source Code Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this License,
+        or sublicense it under different terms, provided that the license for
+        the Executable Form does not attempt to limit or alter the recipients’
+        rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for the
+     Covered Software. If the Larger Work is a combination of Covered Software
+     with a work governed by one or more Secondary Licenses, and the Covered
+     Software is not Incompatible With Secondary Licenses, this License permits
+     You to additionally distribute such Covered Software under the terms of
+     such Secondary License(s), so that the recipient of the Larger Work may, at
+     their option, further distribute the Covered Software under the terms of
+     either this License or such Secondary License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices (including
+     copyright notices, patent notices, disclaimers of warranty, or limitations
+     of liability) contained within the Source Code Form of the Covered
+     Software, except that You may alter any license notices to the extent
+     required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on behalf
+     of any Contributor. You must make it absolutely clear that any such
+     warranty, support, indemnity, or liability obligation is offered by You
+     alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute, judicial
+   order, or regulation then You must: (a) comply with the terms of this License
+   to the maximum extent possible; and (b) describe the limitations and the code
+   they affect. Such description must be placed in a text file included with all
+   distributions of the Covered Software under this License. Except to the
+   extent prohibited by statute or regulation, such description must be
+   sufficiently detailed for a recipient of ordinary skill to be able to
+   understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
+     if such Contributor fails to notify You of the non-compliance by some
+     reasonable means prior to 60 days after You have come back into compliance.
+     Moreover, Your grants from a particular Contributor are reinstated on an
+     ongoing basis if such Contributor notifies You of the non-compliance by
+     some reasonable means, this is the first time You have received notice of
+     non-compliance with this License from such Contributor, and You become
+     compliant prior to 30 days after Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions, counter-claims,
+     and cross-claims) alleging that a Contributor Version directly or
+     indirectly infringes any patent, then the rights granted to You by any and
+     all Contributors for the Covered Software under Section 2.1 of this License
+     shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an “as is” basis, without
+   warranty of any kind, either expressed, implied, or statutory, including,
+   without limitation, warranties that the Covered Software is free of defects,
+   merchantable, fit for a particular purpose or non-infringing. The entire
+   risk as to the quality and performance of the Covered Software is with You.
+   Should any Covered Software prove defective in any respect, You (not any
+   Contributor) assume the cost of any necessary servicing, repair, or
+   correction. This disclaimer of warranty constitutes an essential part of this
+   License. No use of  any Covered Software is authorized under this License
+   except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from such
+   party’s negligence to the extent applicable law prohibits such limitation.
+   Some jurisdictions do not allow the exclusion or limitation of incidental or
+   consequential damages, so this exclusion and limitation may not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts of
+   a jurisdiction where the defendant maintains its principal place of business
+   and such litigation shall be governed by laws of that jurisdiction, without
+   reference to its conflict-of-law provisions. Nothing in this Section shall
+   prevent a party’s ability to bring cross-claims or counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject matter
+   hereof. If any provision of this License is held to be unenforceable, such
+   provision shall be reformed only to the extent necessary to make it
+   enforceable. Any law or regulation which provides that the language of a
+   contract shall be construed against the drafter shall not be used to construe
+   this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version of
+      the License under which You originally received the Covered Software, or
+      under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a modified
+      version of this License if you rename the license and remove any
+      references to the name of the license steward (except to note that such
+      modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
+      If You choose to distribute Source Code Form that is Incompatible With
+      Secondary Licenses under the terms of this version of the License, the
+      notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file, then
+You may include the notice in a location (such as a LICENSE file in a relevant
+directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - “Incompatible With Secondary Licenses” Notice
+
+      This Source Code Form is “Incompatible
+      With Secondary Licenses”, as defined by
+      the Mozilla Public License, v. 2.0.
+
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/gopkg.in/cheggaaa/pb.v1/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/LICENSE
similarity index 58%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/gopkg.in/cheggaaa/pb.v1/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/LICENSE
index 5119703339..efcb2414a3 100644
--- a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/gopkg.in/cheggaaa/pb.v1/LICENSE
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/LICENSE
@@ -1,12 +1,10 @@
-Copyright (c) 2012-2015, Sergey Cherepanov
+Copyright (c) 2014, Eric Urban
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-* Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/inconshreveable/mousetrap/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/inconshreveable/mousetrap/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/kballard/go-shellquote/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/kballard/go-shellquote/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/kballard/go-shellquote/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/kballard/go-shellquote/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/kr/pty/License b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/kr/pty/License
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/kr/pty/License
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/kr/pty/License
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/pborman/uuid/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/petar/GoLLRB/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/petar/GoLLRB/LICENSE
new file mode 100644
index 0000000000..b75312c787
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/petar/GoLLRB/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2010, Petar Maymounkov
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+(*) Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+
+(*) Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+(*) Neither the name of Petar Maymounkov nor the names of its contributors may be
+used to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/peterbourgon/diskv/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/peterbourgon/diskv/LICENSE
new file mode 100644
index 0000000000..41ce7f16e1
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/peterbourgon/diskv/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2011-2012 Peter Bourgon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/LICENSE.txt b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/russross/blackfriday/LICENSE.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/LICENSE.txt
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/russross/blackfriday/LICENSE.txt
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/spf13/cobra/LICENSE.txt b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/spf13/cobra/LICENSE.txt
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/licenses.go b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/licenses.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/licenses.go
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/licenses.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/spf13/pflag/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/spf13/pflag/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE
diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/vishvananda/netns/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/vishvananda/netns/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/golang.org/x/crypto/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/golang.org/x/crypto/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/golang.org/x/sys/PATENTS b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/PATENTS
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/golang.org/x/sys/PATENTS
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/PATENTS
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/golang.org/x/net/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/net/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/golang.org/x/net/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/net/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/golang.org/x/crypto/PATENTS b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/net/PATENTS
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/golang.org/x/crypto/PATENTS
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/net/PATENTS
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/transport/cancellable/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/sys/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/transport/cancellable/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/sys/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/golang.org/x/net/PATENTS b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/sys/PATENTS
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/golang.org/x/net/PATENTS
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/sys/PATENTS
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/tools/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/tools/LICENSE
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/PATENTS b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/tools/PATENTS
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/PATENTS
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/tools/PATENTS
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/google.golang.org/grpc/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/google.golang.org/grpc/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/google.golang.org/grpc/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/google.golang.org/grpc/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/google.golang.org/grpc/PATENTS b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/google.golang.org/grpc/PATENTS
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/google.golang.org/grpc/PATENTS
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/google.golang.org/grpc/PATENTS
diff --git a/Godeps/_workspace/src/github.com/golang/mock/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/mock/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/LICENSE
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/examples/update-demo/local/LICENSE.angular b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/examples/update-demo/local/LICENSE.angular
new file mode 100644
index 0000000000..020f87acd2
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/examples/update-demo/local/LICENSE.angular
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2010-2014 Google, Inc. http://angularjs.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/kardianos/osext/LICENSE
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/LICENSE
diff --git a/Godeps/_workspace/src/golang.org/x/exp/PATENTS b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/PATENTS
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/exp/PATENTS
rename to vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/PATENTS
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/third_party/htpasswd/COPYING b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/third_party/htpasswd/COPYING
new file mode 100644
index 0000000000..c6b097c016
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/third_party/htpasswd/COPYING
@@ -0,0 +1,28 @@
+Copyright (C) 2003-2013 Edgewall Software
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+ 3. The name of the author may not be used to endorse or promote
+    products derived from this software without specific prior
+    written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/third_party/pause/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/third_party/pause/LICENSE
new file mode 100644
index 0000000000..2b5e5ff1ab
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/third_party/pause/LICENSE
@@ -0,0 +1,19 @@
+The Expat/MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the 
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+DEALINGS IN THE SOFTWARE.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/third_party/swagger-ui/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/third_party/swagger-ui/LICENSE
new file mode 100644
index 0000000000..9f93e067e8
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/k8s.io/kubernetes/third_party/swagger-ui/LICENSE
@@ -0,0 +1,11 @@
+Copyright 2014 Reverb Technologies, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/vendor/github.com/coreos/rkt/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/LICENSE b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/LICENSE
new file mode 100644
index 0000000000..efa1aa1896
--- /dev/null
+++ b/vendor/github.com/coreos/rkt/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/LICENSE
@@ -0,0 +1,57 @@
+Copyright (c) 2012 Péter Surányi. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+----------------------------------------------------------------------
+Portions of inf.Dec's source code have been derived from Go and are
+covered by the following license:
+----------------------------------------------------------------------
+
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/jonboulle/clockwork/LICENSE b/vendor/github.com/coreos/rkt/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/jonboulle/clockwork/LICENSE
rename to vendor/github.com/coreos/rkt/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/README.md b/vendor/github.com/coreos/rkt/api/v1alpha/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/README.md
rename to vendor/github.com/coreos/rkt/api/v1alpha/README.md
diff --git a/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.pb.go b/vendor/github.com/coreos/rkt/api/v1alpha/api.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.pb.go
rename to vendor/github.com/coreos/rkt/api/v1alpha/api.pb.go
diff --git a/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.proto b/vendor/github.com/coreos/rkt/api/v1alpha/api.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.proto
rename to vendor/github.com/coreos/rkt/api/v1alpha/api.proto
diff --git a/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/client_example.go b/vendor/github.com/coreos/rkt/api/v1alpha/client_example.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/client_example.go
rename to vendor/github.com/coreos/rkt/api/v1alpha/client_example.go
diff --git a/Godeps/_workspace/src/github.com/coreos/rkt/pkg/acl/LICENSE.MIT b/vendor/github.com/coreos/rkt/pkg/acl/LICENSE.MIT
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/rkt/pkg/acl/LICENSE.MIT
rename to vendor/github.com/coreos/rkt/pkg/acl/LICENSE.MIT
diff --git a/Godeps/_workspace/src/github.com/coreos/rkt/store/LICENSE.BSD b/vendor/github.com/coreos/rkt/store/LICENSE.BSD
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/rkt/store/LICENSE.BSD
rename to vendor/github.com/coreos/rkt/store/LICENSE.BSD
diff --git a/Godeps/_workspace/src/github.com/cpuguy83/go-md2man/LICENSE.md b/vendor/github.com/cpuguy83/go-md2man/LICENSE.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/cpuguy83/go-md2man/LICENSE.md
rename to vendor/github.com/cpuguy83/go-md2man/LICENSE.md
diff --git a/Godeps/_workspace/src/github.com/cpuguy83/go-md2man/md2man/md2man.go b/vendor/github.com/cpuguy83/go-md2man/md2man/md2man.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/cpuguy83/go-md2man/md2man/md2man.go
rename to vendor/github.com/cpuguy83/go-md2man/md2man/md2man.go
diff --git a/Godeps/_workspace/src/github.com/cpuguy83/go-md2man/md2man/roff.go b/vendor/github.com/cpuguy83/go-md2man/md2man/roff.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/cpuguy83/go-md2man/md2man/roff.go
rename to vendor/github.com/cpuguy83/go-md2man/md2man/roff.go
diff --git a/vendor/github.com/davecgh/go-spew/LICENSE b/vendor/github.com/davecgh/go-spew/LICENSE
new file mode 100644
index 0000000000..2a7cfd2bf6
--- /dev/null
+++ b/vendor/github.com/davecgh/go-spew/LICENSE
@@ -0,0 +1,13 @@
+Copyright (c) 2012-2013 Dave Collins <dave@davec.name>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
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/daviddengcn/go-colortext/.gitignore b/vendor/github.com/daviddengcn/go-colortext/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/daviddengcn/go-colortext/.gitignore
rename to vendor/github.com/daviddengcn/go-colortext/.gitignore
diff --git a/Godeps/_workspace/src/github.com/daviddengcn/go-colortext/README.md b/vendor/github.com/daviddengcn/go-colortext/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/daviddengcn/go-colortext/README.md
rename to vendor/github.com/daviddengcn/go-colortext/README.md
diff --git a/Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct.go b/vendor/github.com/daviddengcn/go-colortext/ct.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct.go
rename to vendor/github.com/daviddengcn/go-colortext/ct.go
diff --git a/Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct_ansi.go b/vendor/github.com/daviddengcn/go-colortext/ct_ansi.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct_ansi.go
rename to vendor/github.com/daviddengcn/go-colortext/ct_ansi.go
diff --git a/Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct_win.go b/vendor/github.com/daviddengcn/go-colortext/ct_win.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct_win.go
rename to vendor/github.com/daviddengcn/go-colortext/ct_win.go
diff --git a/Godeps/_workspace/src/github.com/dgrijalva/jwt-go/.gitignore b/vendor/github.com/dgrijalva/jwt-go/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/dgrijalva/jwt-go/.gitignore
rename to vendor/github.com/dgrijalva/jwt-go/.gitignore
diff --git a/Godeps/_workspace/src/github.com/dgrijalva/jwt-go/LICENSE b/vendor/github.com/dgrijalva/jwt-go/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/dgrijalva/jwt-go/LICENSE
rename to vendor/github.com/dgrijalva/jwt-go/LICENSE
diff --git a/Godeps/_workspace/src/github.com/dgrijalva/jwt-go/README.md b/vendor/github.com/dgrijalva/jwt-go/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/dgrijalva/jwt-go/README.md
rename to vendor/github.com/dgrijalva/jwt-go/README.md
diff --git a/Godeps/_workspace/src/github.com/dgrijalva/jwt-go/VERSION_HISTORY.md b/vendor/github.com/dgrijalva/jwt-go/VERSION_HISTORY.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/dgrijalva/jwt-go/VERSION_HISTORY.md
rename to vendor/github.com/dgrijalva/jwt-go/VERSION_HISTORY.md
diff --git a/Godeps/_workspace/src/github.com/dgrijalva/jwt-go/cmd/jwt/app.go b/vendor/github.com/dgrijalva/jwt-go/cmd/jwt/app.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/dgrijalva/jwt-go/cmd/jwt/app.go
rename to vendor/github.com/dgrijalva/jwt-go/cmd/jwt/app.go
diff --git a/Godeps/_workspace/src/github.com/dgrijalva/jwt-go/doc.go b/vendor/github.com/dgrijalva/jwt-go/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/dgrijalva/jwt-go/doc.go
rename to vendor/github.com/dgrijalva/jwt-go/doc.go
diff --git a/Godeps/_workspace/src/github.com/dgrijalva/jwt-go/errors.go b/vendor/github.com/dgrijalva/jwt-go/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/dgrijalva/jwt-go/errors.go
rename to vendor/github.com/dgrijalva/jwt-go/errors.go
diff --git a/Godeps/_workspace/src/github.com/dgrijalva/jwt-go/hmac.go b/vendor/github.com/dgrijalva/jwt-go/hmac.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/dgrijalva/jwt-go/hmac.go
rename to vendor/github.com/dgrijalva/jwt-go/hmac.go
diff --git a/Godeps/_workspace/src/github.com/dgrijalva/jwt-go/jwt.go b/vendor/github.com/dgrijalva/jwt-go/jwt.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/dgrijalva/jwt-go/jwt.go
rename to vendor/github.com/dgrijalva/jwt-go/jwt.go
diff --git a/Godeps/_workspace/src/github.com/dgrijalva/jwt-go/rsa.go b/vendor/github.com/dgrijalva/jwt-go/rsa.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/dgrijalva/jwt-go/rsa.go
rename to vendor/github.com/dgrijalva/jwt-go/rsa.go
diff --git a/Godeps/_workspace/src/github.com/dgrijalva/jwt-go/rsa_utils.go b/vendor/github.com/dgrijalva/jwt-go/rsa_utils.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/dgrijalva/jwt-go/rsa_utils.go
rename to vendor/github.com/dgrijalva/jwt-go/rsa_utils.go
diff --git a/Godeps/_workspace/src/github.com/dgrijalva/jwt-go/signing_method.go b/vendor/github.com/dgrijalva/jwt-go/signing_method.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/dgrijalva/jwt-go/signing_method.go
rename to vendor/github.com/dgrijalva/jwt-go/signing_method.go
diff --git a/Godeps/_workspace/src/github.com/dgrijalva/jwt-go/test/hmacTestKey b/vendor/github.com/dgrijalva/jwt-go/test/hmacTestKey
similarity index 100%
rename from Godeps/_workspace/src/github.com/dgrijalva/jwt-go/test/hmacTestKey
rename to vendor/github.com/dgrijalva/jwt-go/test/hmacTestKey
diff --git a/Godeps/_workspace/src/github.com/dgrijalva/jwt-go/test/sample_key b/vendor/github.com/dgrijalva/jwt-go/test/sample_key
similarity index 100%
rename from Godeps/_workspace/src/github.com/dgrijalva/jwt-go/test/sample_key
rename to vendor/github.com/dgrijalva/jwt-go/test/sample_key
diff --git a/Godeps/_workspace/src/github.com/dgrijalva/jwt-go/test/sample_key.pub b/vendor/github.com/dgrijalva/jwt-go/test/sample_key.pub
similarity index 100%
rename from Godeps/_workspace/src/github.com/dgrijalva/jwt-go/test/sample_key.pub
rename to vendor/github.com/dgrijalva/jwt-go/test/sample_key.pub
diff --git a/vendor/github.com/docker/distribution/LICENSE b/vendor/github.com/docker/distribution/LICENSE
new file mode 100644
index 0000000000..e06d208186
--- /dev/null
+++ b/vendor/github.com/docker/distribution/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/digest/digest.go b/vendor/github.com/docker/distribution/digest/digest.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/digest/digest.go
rename to vendor/github.com/docker/distribution/digest/digest.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/digest/digester.go b/vendor/github.com/docker/distribution/digest/digester.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/digest/digester.go
rename to vendor/github.com/docker/distribution/digest/digester.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/digest/doc.go b/vendor/github.com/docker/distribution/digest/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/digest/doc.go
rename to vendor/github.com/docker/distribution/digest/doc.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/digest/set.go b/vendor/github.com/docker/distribution/digest/set.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/digest/set.go
rename to vendor/github.com/docker/distribution/digest/set.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/digest/verifiers.go b/vendor/github.com/docker/distribution/digest/verifiers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/digest/verifiers.go
rename to vendor/github.com/docker/distribution/digest/verifiers.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/reference/reference.go b/vendor/github.com/docker/distribution/reference/reference.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/reference/reference.go
rename to vendor/github.com/docker/distribution/reference/reference.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/reference/regexp.go b/vendor/github.com/docker/distribution/reference/regexp.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/reference/regexp.go
rename to vendor/github.com/docker/distribution/reference/regexp.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/LICENSE b/vendor/github.com/docker/docker/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/LICENSE
rename to vendor/github.com/docker/docker/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/docker/NOTICE b/vendor/github.com/docker/docker/NOTICE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/NOTICE
rename to vendor/github.com/docker/docker/NOTICE
diff --git a/Godeps/_workspace/src/github.com/docker/docker/contrib/syntax/vim/LICENSE b/vendor/github.com/docker/docker/contrib/syntax/vim/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/contrib/syntax/vim/LICENSE
rename to vendor/github.com/docker/docker/contrib/syntax/vim/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/docker/docs/project/images/red_notice.png b/vendor/github.com/docker/docker/docs/project/images/red_notice.png
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/docs/project/images/red_notice.png
rename to vendor/github.com/docker/docker/docs/project/images/red_notice.png
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go b/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go
rename to vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mflag/LICENSE b/vendor/github.com/docker/docker/pkg/mflag/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mflag/LICENSE
rename to vendor/github.com/docker/docker/pkg/mflag/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags.go b/vendor/github.com/docker/docker/pkg/mount/flags.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags.go
rename to vendor/github.com/docker/docker/pkg/mount/flags.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_freebsd.go b/vendor/github.com/docker/docker/pkg/mount/flags_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_freebsd.go
rename to vendor/github.com/docker/docker/pkg/mount/flags_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_linux.go b/vendor/github.com/docker/docker/pkg/mount/flags_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_linux.go
rename to vendor/github.com/docker/docker/pkg/mount/flags_linux.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_unsupported.go b/vendor/github.com/docker/docker/pkg/mount/flags_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_unsupported.go
rename to vendor/github.com/docker/docker/pkg/mount/flags_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mount.go b/vendor/github.com/docker/docker/pkg/mount/mount.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mount.go
rename to vendor/github.com/docker/docker/pkg/mount/mount.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_freebsd.go b/vendor/github.com/docker/docker/pkg/mount/mounter_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_freebsd.go
rename to vendor/github.com/docker/docker/pkg/mount/mounter_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_linux.go b/vendor/github.com/docker/docker/pkg/mount/mounter_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_linux.go
rename to vendor/github.com/docker/docker/pkg/mount/mounter_linux.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_unsupported.go b/vendor/github.com/docker/docker/pkg/mount/mounter_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_unsupported.go
rename to vendor/github.com/docker/docker/pkg/mount/mounter_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo.go b/vendor/github.com/docker/docker/pkg/mount/mountinfo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo.go
rename to vendor/github.com/docker/docker/pkg/mount/mountinfo.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go b/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go
rename to vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_linux.go b/vendor/github.com/docker/docker/pkg/mount/mountinfo_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_linux.go
rename to vendor/github.com/docker/docker/pkg/mount/mountinfo_linux.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go b/vendor/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go
rename to vendor/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go b/vendor/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go
rename to vendor/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/stdcopy/stdcopy.go b/vendor/github.com/docker/docker/pkg/stdcopy/stdcopy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/stdcopy/stdcopy.go
rename to vendor/github.com/docker/docker/pkg/stdcopy/stdcopy.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.APACHE b/vendor/github.com/docker/docker/pkg/symlink/LICENSE.APACHE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.APACHE
rename to vendor/github.com/docker/docker/pkg/symlink/LICENSE.APACHE
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.BSD b/vendor/github.com/docker/docker/pkg/symlink/LICENSE.BSD
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.BSD
rename to vendor/github.com/docker/docker/pkg/symlink/LICENSE.BSD
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/README.md b/vendor/github.com/docker/docker/pkg/symlink/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/README.md
rename to vendor/github.com/docker/docker/pkg/symlink/README.md
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/fs.go b/vendor/github.com/docker/docker/pkg/symlink/fs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/fs.go
rename to vendor/github.com/docker/docker/pkg/symlink/fs.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/tc_linux_cgo.go b/vendor/github.com/docker/docker/pkg/term/tc_linux_cgo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/tc_linux_cgo.go
rename to vendor/github.com/docker/docker/pkg/term/tc_linux_cgo.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/tc_other.go b/vendor/github.com/docker/docker/pkg/term/tc_other.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/tc_other.go
rename to vendor/github.com/docker/docker/pkg/term/tc_other.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/term.go b/vendor/github.com/docker/docker/pkg/term/term.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/term.go
rename to vendor/github.com/docker/docker/pkg/term/term.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/term_windows.go b/vendor/github.com/docker/docker/pkg/term/term_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/term_windows.go
rename to vendor/github.com/docker/docker/pkg/term/term_windows.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/termios_darwin.go b/vendor/github.com/docker/docker/pkg/term/termios_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/termios_darwin.go
rename to vendor/github.com/docker/docker/pkg/term/termios_darwin.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/termios_freebsd.go b/vendor/github.com/docker/docker/pkg/term/termios_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/termios_freebsd.go
rename to vendor/github.com/docker/docker/pkg/term/termios_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/termios_linux.go b/vendor/github.com/docker/docker/pkg/term/termios_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/termios_linux.go
rename to vendor/github.com/docker/docker/pkg/term/termios_linux.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/winconsole/console_windows.go b/vendor/github.com/docker/docker/pkg/term/winconsole/console_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/winconsole/console_windows.go
rename to vendor/github.com/docker/docker/pkg/term/winconsole/console_windows.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/winconsole/term_emulator.go b/vendor/github.com/docker/docker/pkg/term/winconsole/term_emulator.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/winconsole/term_emulator.go
rename to vendor/github.com/docker/docker/pkg/term/winconsole/term_emulator.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/timeutils/json.go b/vendor/github.com/docker/docker/pkg/timeutils/json.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/timeutils/json.go
rename to vendor/github.com/docker/docker/pkg/timeutils/json.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/timeutils/utils.go b/vendor/github.com/docker/docker/pkg/timeutils/utils.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/timeutils/utils.go
rename to vendor/github.com/docker/docker/pkg/timeutils/utils.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/units/duration.go b/vendor/github.com/docker/docker/pkg/units/duration.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/units/duration.go
rename to vendor/github.com/docker/docker/pkg/units/duration.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/units/size.go b/vendor/github.com/docker/docker/pkg/units/size.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/units/size.go
rename to vendor/github.com/docker/docker/pkg/units/size.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/LICENSE b/vendor/github.com/docker/engine-api/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/LICENSE
rename to vendor/github.com/docker/engine-api/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/client.go b/vendor/github.com/docker/engine-api/client/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/client.go
rename to vendor/github.com/docker/engine-api/client/client.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/client_darwin.go b/vendor/github.com/docker/engine-api/client/client_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/client_darwin.go
rename to vendor/github.com/docker/engine-api/client/client_darwin.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/client_unix.go b/vendor/github.com/docker/engine-api/client/client_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/client_unix.go
rename to vendor/github.com/docker/engine-api/client/client_unix.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/client_windows.go b/vendor/github.com/docker/engine-api/client/client_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/client_windows.go
rename to vendor/github.com/docker/engine-api/client/client_windows.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_attach.go b/vendor/github.com/docker/engine-api/client/container_attach.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_attach.go
rename to vendor/github.com/docker/engine-api/client/container_attach.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_commit.go b/vendor/github.com/docker/engine-api/client/container_commit.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_commit.go
rename to vendor/github.com/docker/engine-api/client/container_commit.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_copy.go b/vendor/github.com/docker/engine-api/client/container_copy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_copy.go
rename to vendor/github.com/docker/engine-api/client/container_copy.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_create.go b/vendor/github.com/docker/engine-api/client/container_create.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_create.go
rename to vendor/github.com/docker/engine-api/client/container_create.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_diff.go b/vendor/github.com/docker/engine-api/client/container_diff.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_diff.go
rename to vendor/github.com/docker/engine-api/client/container_diff.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_exec.go b/vendor/github.com/docker/engine-api/client/container_exec.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_exec.go
rename to vendor/github.com/docker/engine-api/client/container_exec.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_export.go b/vendor/github.com/docker/engine-api/client/container_export.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_export.go
rename to vendor/github.com/docker/engine-api/client/container_export.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_inspect.go b/vendor/github.com/docker/engine-api/client/container_inspect.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_inspect.go
rename to vendor/github.com/docker/engine-api/client/container_inspect.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_kill.go b/vendor/github.com/docker/engine-api/client/container_kill.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_kill.go
rename to vendor/github.com/docker/engine-api/client/container_kill.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_list.go b/vendor/github.com/docker/engine-api/client/container_list.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_list.go
rename to vendor/github.com/docker/engine-api/client/container_list.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_logs.go b/vendor/github.com/docker/engine-api/client/container_logs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_logs.go
rename to vendor/github.com/docker/engine-api/client/container_logs.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_pause.go b/vendor/github.com/docker/engine-api/client/container_pause.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_pause.go
rename to vendor/github.com/docker/engine-api/client/container_pause.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_remove.go b/vendor/github.com/docker/engine-api/client/container_remove.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_remove.go
rename to vendor/github.com/docker/engine-api/client/container_remove.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_rename.go b/vendor/github.com/docker/engine-api/client/container_rename.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_rename.go
rename to vendor/github.com/docker/engine-api/client/container_rename.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_resize.go b/vendor/github.com/docker/engine-api/client/container_resize.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_resize.go
rename to vendor/github.com/docker/engine-api/client/container_resize.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_restart.go b/vendor/github.com/docker/engine-api/client/container_restart.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_restart.go
rename to vendor/github.com/docker/engine-api/client/container_restart.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_start.go b/vendor/github.com/docker/engine-api/client/container_start.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_start.go
rename to vendor/github.com/docker/engine-api/client/container_start.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_stats.go b/vendor/github.com/docker/engine-api/client/container_stats.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_stats.go
rename to vendor/github.com/docker/engine-api/client/container_stats.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_stop.go b/vendor/github.com/docker/engine-api/client/container_stop.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_stop.go
rename to vendor/github.com/docker/engine-api/client/container_stop.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_top.go b/vendor/github.com/docker/engine-api/client/container_top.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_top.go
rename to vendor/github.com/docker/engine-api/client/container_top.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_unpause.go b/vendor/github.com/docker/engine-api/client/container_unpause.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_unpause.go
rename to vendor/github.com/docker/engine-api/client/container_unpause.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_update.go b/vendor/github.com/docker/engine-api/client/container_update.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_update.go
rename to vendor/github.com/docker/engine-api/client/container_update.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_wait.go b/vendor/github.com/docker/engine-api/client/container_wait.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/container_wait.go
rename to vendor/github.com/docker/engine-api/client/container_wait.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/errors.go b/vendor/github.com/docker/engine-api/client/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/errors.go
rename to vendor/github.com/docker/engine-api/client/errors.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/events.go b/vendor/github.com/docker/engine-api/client/events.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/events.go
rename to vendor/github.com/docker/engine-api/client/events.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/hijack.go b/vendor/github.com/docker/engine-api/client/hijack.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/hijack.go
rename to vendor/github.com/docker/engine-api/client/hijack.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_build.go b/vendor/github.com/docker/engine-api/client/image_build.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_build.go
rename to vendor/github.com/docker/engine-api/client/image_build.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_create.go b/vendor/github.com/docker/engine-api/client/image_create.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_create.go
rename to vendor/github.com/docker/engine-api/client/image_create.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_history.go b/vendor/github.com/docker/engine-api/client/image_history.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_history.go
rename to vendor/github.com/docker/engine-api/client/image_history.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_import.go b/vendor/github.com/docker/engine-api/client/image_import.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_import.go
rename to vendor/github.com/docker/engine-api/client/image_import.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_inspect.go b/vendor/github.com/docker/engine-api/client/image_inspect.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_inspect.go
rename to vendor/github.com/docker/engine-api/client/image_inspect.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_list.go b/vendor/github.com/docker/engine-api/client/image_list.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_list.go
rename to vendor/github.com/docker/engine-api/client/image_list.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_load.go b/vendor/github.com/docker/engine-api/client/image_load.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_load.go
rename to vendor/github.com/docker/engine-api/client/image_load.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_pull.go b/vendor/github.com/docker/engine-api/client/image_pull.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_pull.go
rename to vendor/github.com/docker/engine-api/client/image_pull.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_push.go b/vendor/github.com/docker/engine-api/client/image_push.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_push.go
rename to vendor/github.com/docker/engine-api/client/image_push.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_remove.go b/vendor/github.com/docker/engine-api/client/image_remove.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_remove.go
rename to vendor/github.com/docker/engine-api/client/image_remove.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_save.go b/vendor/github.com/docker/engine-api/client/image_save.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_save.go
rename to vendor/github.com/docker/engine-api/client/image_save.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_search.go b/vendor/github.com/docker/engine-api/client/image_search.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_search.go
rename to vendor/github.com/docker/engine-api/client/image_search.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/image_tag.go b/vendor/github.com/docker/engine-api/client/image_tag.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/image_tag.go
rename to vendor/github.com/docker/engine-api/client/image_tag.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/info.go b/vendor/github.com/docker/engine-api/client/info.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/info.go
rename to vendor/github.com/docker/engine-api/client/info.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/interface.go b/vendor/github.com/docker/engine-api/client/interface.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/interface.go
rename to vendor/github.com/docker/engine-api/client/interface.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/login.go b/vendor/github.com/docker/engine-api/client/login.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/login.go
rename to vendor/github.com/docker/engine-api/client/login.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/network_connect.go b/vendor/github.com/docker/engine-api/client/network_connect.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/network_connect.go
rename to vendor/github.com/docker/engine-api/client/network_connect.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/network_create.go b/vendor/github.com/docker/engine-api/client/network_create.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/network_create.go
rename to vendor/github.com/docker/engine-api/client/network_create.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/network_disconnect.go b/vendor/github.com/docker/engine-api/client/network_disconnect.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/network_disconnect.go
rename to vendor/github.com/docker/engine-api/client/network_disconnect.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/network_inspect.go b/vendor/github.com/docker/engine-api/client/network_inspect.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/network_inspect.go
rename to vendor/github.com/docker/engine-api/client/network_inspect.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/network_list.go b/vendor/github.com/docker/engine-api/client/network_list.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/network_list.go
rename to vendor/github.com/docker/engine-api/client/network_list.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/network_remove.go b/vendor/github.com/docker/engine-api/client/network_remove.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/network_remove.go
rename to vendor/github.com/docker/engine-api/client/network_remove.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/request.go b/vendor/github.com/docker/engine-api/client/request.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/request.go
rename to vendor/github.com/docker/engine-api/client/request.go
diff --git a/Godeps/_workspace/src/golang.org/x/exp/LICENSE b/vendor/github.com/docker/engine-api/client/transport/cancellable/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/exp/LICENSE
rename to vendor/github.com/docker/engine-api/client/transport/cancellable/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/transport/cancellable/canceler.go b/vendor/github.com/docker/engine-api/client/transport/cancellable/canceler.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/transport/cancellable/canceler.go
rename to vendor/github.com/docker/engine-api/client/transport/cancellable/canceler.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/transport/cancellable/canceler_go14.go b/vendor/github.com/docker/engine-api/client/transport/cancellable/canceler_go14.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/transport/cancellable/canceler_go14.go
rename to vendor/github.com/docker/engine-api/client/transport/cancellable/canceler_go14.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/transport/cancellable/cancellable.go b/vendor/github.com/docker/engine-api/client/transport/cancellable/cancellable.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/transport/cancellable/cancellable.go
rename to vendor/github.com/docker/engine-api/client/transport/cancellable/cancellable.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/transport/client.go b/vendor/github.com/docker/engine-api/client/transport/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/transport/client.go
rename to vendor/github.com/docker/engine-api/client/transport/client.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/transport/transport.go b/vendor/github.com/docker/engine-api/client/transport/transport.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/transport/transport.go
rename to vendor/github.com/docker/engine-api/client/transport/transport.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/version.go b/vendor/github.com/docker/engine-api/client/version.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/version.go
rename to vendor/github.com/docker/engine-api/client/version.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/volume_create.go b/vendor/github.com/docker/engine-api/client/volume_create.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/volume_create.go
rename to vendor/github.com/docker/engine-api/client/volume_create.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/volume_inspect.go b/vendor/github.com/docker/engine-api/client/volume_inspect.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/volume_inspect.go
rename to vendor/github.com/docker/engine-api/client/volume_inspect.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/volume_list.go b/vendor/github.com/docker/engine-api/client/volume_list.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/volume_list.go
rename to vendor/github.com/docker/engine-api/client/volume_list.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/volume_remove.go b/vendor/github.com/docker/engine-api/client/volume_remove.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/client/volume_remove.go
rename to vendor/github.com/docker/engine-api/client/volume_remove.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/auth.go b/vendor/github.com/docker/engine-api/types/auth.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/auth.go
rename to vendor/github.com/docker/engine-api/types/auth.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/blkiodev/blkio.go b/vendor/github.com/docker/engine-api/types/blkiodev/blkio.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/blkiodev/blkio.go
rename to vendor/github.com/docker/engine-api/types/blkiodev/blkio.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/client.go b/vendor/github.com/docker/engine-api/types/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/client.go
rename to vendor/github.com/docker/engine-api/types/client.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/configs.go b/vendor/github.com/docker/engine-api/types/configs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/configs.go
rename to vendor/github.com/docker/engine-api/types/configs.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/container/config.go b/vendor/github.com/docker/engine-api/types/container/config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/container/config.go
rename to vendor/github.com/docker/engine-api/types/container/config.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/container/host_config.go b/vendor/github.com/docker/engine-api/types/container/host_config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/container/host_config.go
rename to vendor/github.com/docker/engine-api/types/container/host_config.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/container/hostconfig_unix.go b/vendor/github.com/docker/engine-api/types/container/hostconfig_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/container/hostconfig_unix.go
rename to vendor/github.com/docker/engine-api/types/container/hostconfig_unix.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/container/hostconfig_windows.go b/vendor/github.com/docker/engine-api/types/container/hostconfig_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/container/hostconfig_windows.go
rename to vendor/github.com/docker/engine-api/types/container/hostconfig_windows.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/events/events.go b/vendor/github.com/docker/engine-api/types/events/events.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/events/events.go
rename to vendor/github.com/docker/engine-api/types/events/events.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/filters/parse.go b/vendor/github.com/docker/engine-api/types/filters/parse.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/filters/parse.go
rename to vendor/github.com/docker/engine-api/types/filters/parse.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/network/network.go b/vendor/github.com/docker/engine-api/types/network/network.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/network/network.go
rename to vendor/github.com/docker/engine-api/types/network/network.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/reference/image_reference.go b/vendor/github.com/docker/engine-api/types/reference/image_reference.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/reference/image_reference.go
rename to vendor/github.com/docker/engine-api/types/reference/image_reference.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/registry/registry.go b/vendor/github.com/docker/engine-api/types/registry/registry.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/registry/registry.go
rename to vendor/github.com/docker/engine-api/types/registry/registry.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/seccomp.go b/vendor/github.com/docker/engine-api/types/seccomp.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/seccomp.go
rename to vendor/github.com/docker/engine-api/types/seccomp.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/stats.go b/vendor/github.com/docker/engine-api/types/stats.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/stats.go
rename to vendor/github.com/docker/engine-api/types/stats.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/strslice/strslice.go b/vendor/github.com/docker/engine-api/types/strslice/strslice.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/strslice/strslice.go
rename to vendor/github.com/docker/engine-api/types/strslice/strslice.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/time/timestamp.go b/vendor/github.com/docker/engine-api/types/time/timestamp.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/time/timestamp.go
rename to vendor/github.com/docker/engine-api/types/time/timestamp.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/types.go b/vendor/github.com/docker/engine-api/types/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/types.go
rename to vendor/github.com/docker/engine-api/types/types.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/versions/README.md b/vendor/github.com/docker/engine-api/types/versions/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/versions/README.md
rename to vendor/github.com/docker/engine-api/types/versions/README.md
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/versions/compare.go b/vendor/github.com/docker/engine-api/types/versions/compare.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/versions/compare.go
rename to vendor/github.com/docker/engine-api/types/versions/compare.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/versions/v1p19/types.go b/vendor/github.com/docker/engine-api/types/versions/v1p19/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/versions/v1p19/types.go
rename to vendor/github.com/docker/engine-api/types/versions/v1p19/types.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/types/versions/v1p20/types.go b/vendor/github.com/docker/engine-api/types/versions/v1p20/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/engine-api/types/versions/v1p20/types.go
rename to vendor/github.com/docker/engine-api/types/versions/v1p20/types.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/LICENSE b/vendor/github.com/docker/go-connections/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-connections/LICENSE
rename to vendor/github.com/docker/go-connections/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/nat/nat.go b/vendor/github.com/docker/go-connections/nat/nat.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-connections/nat/nat.go
rename to vendor/github.com/docker/go-connections/nat/nat.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/nat/parse.go b/vendor/github.com/docker/go-connections/nat/parse.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-connections/nat/parse.go
rename to vendor/github.com/docker/go-connections/nat/parse.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/nat/sort.go b/vendor/github.com/docker/go-connections/nat/sort.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-connections/nat/sort.go
rename to vendor/github.com/docker/go-connections/nat/sort.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/README.md b/vendor/github.com/docker/go-connections/sockets/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/README.md
rename to vendor/github.com/docker/go-connections/sockets/README.md
diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/inmem_socket.go b/vendor/github.com/docker/go-connections/sockets/inmem_socket.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/inmem_socket.go
rename to vendor/github.com/docker/go-connections/sockets/inmem_socket.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/proxy.go b/vendor/github.com/docker/go-connections/sockets/proxy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/proxy.go
rename to vendor/github.com/docker/go-connections/sockets/proxy.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/sockets.go b/vendor/github.com/docker/go-connections/sockets/sockets.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/sockets.go
rename to vendor/github.com/docker/go-connections/sockets/sockets.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/sockets_unix.go b/vendor/github.com/docker/go-connections/sockets/sockets_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/sockets_unix.go
rename to vendor/github.com/docker/go-connections/sockets/sockets_unix.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/sockets_windows.go b/vendor/github.com/docker/go-connections/sockets/sockets_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/sockets_windows.go
rename to vendor/github.com/docker/go-connections/sockets/sockets_windows.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/tcp_socket.go b/vendor/github.com/docker/go-connections/sockets/tcp_socket.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/tcp_socket.go
rename to vendor/github.com/docker/go-connections/sockets/tcp_socket.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/sockets/unix_socket.go b/vendor/github.com/docker/go-connections/sockets/unix_socket.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-connections/sockets/unix_socket.go
rename to vendor/github.com/docker/go-connections/sockets/unix_socket.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/tlsconfig/config.go b/vendor/github.com/docker/go-connections/tlsconfig/config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-connections/tlsconfig/config.go
rename to vendor/github.com/docker/go-connections/tlsconfig/config.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go b/vendor/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go
rename to vendor/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go b/vendor/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go
rename to vendor/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-units/CONTRIBUTING.md b/vendor/github.com/docker/go-units/CONTRIBUTING.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-units/CONTRIBUTING.md
rename to vendor/github.com/docker/go-units/CONTRIBUTING.md
diff --git a/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.code b/vendor/github.com/docker/go-units/LICENSE.code
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-units/LICENSE.code
rename to vendor/github.com/docker/go-units/LICENSE.code
diff --git a/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.docs b/vendor/github.com/docker/go-units/LICENSE.docs
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-units/LICENSE.docs
rename to vendor/github.com/docker/go-units/LICENSE.docs
diff --git a/Godeps/_workspace/src/github.com/docker/go-units/MAINTAINERS b/vendor/github.com/docker/go-units/MAINTAINERS
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-units/MAINTAINERS
rename to vendor/github.com/docker/go-units/MAINTAINERS
diff --git a/Godeps/_workspace/src/github.com/docker/go-units/README.md b/vendor/github.com/docker/go-units/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-units/README.md
rename to vendor/github.com/docker/go-units/README.md
diff --git a/Godeps/_workspace/src/github.com/docker/go-units/circle.yml b/vendor/github.com/docker/go-units/circle.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-units/circle.yml
rename to vendor/github.com/docker/go-units/circle.yml
diff --git a/Godeps/_workspace/src/github.com/docker/go-units/duration.go b/vendor/github.com/docker/go-units/duration.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-units/duration.go
rename to vendor/github.com/docker/go-units/duration.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-units/size.go b/vendor/github.com/docker/go-units/size.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-units/size.go
rename to vendor/github.com/docker/go-units/size.go
diff --git a/Godeps/_workspace/src/github.com/docker/go-units/ulimit.go b/vendor/github.com/docker/go-units/ulimit.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/go-units/ulimit.go
rename to vendor/github.com/docker/go-units/ulimit.go
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/CONTRIBUTING.md b/vendor/github.com/docker/spdystream/CONTRIBUTING.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/spdystream/CONTRIBUTING.md
rename to vendor/github.com/docker/spdystream/CONTRIBUTING.md
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/docker/libkv/LICENSE b/vendor/github.com/docker/spdystream/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/docker/libkv/LICENSE
rename to vendor/github.com/docker/spdystream/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/LICENSE.docs b/vendor/github.com/docker/spdystream/LICENSE.docs
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/spdystream/LICENSE.docs
rename to vendor/github.com/docker/spdystream/LICENSE.docs
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/MAINTAINERS b/vendor/github.com/docker/spdystream/MAINTAINERS
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/spdystream/MAINTAINERS
rename to vendor/github.com/docker/spdystream/MAINTAINERS
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/README.md b/vendor/github.com/docker/spdystream/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/spdystream/README.md
rename to vendor/github.com/docker/spdystream/README.md
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/connection.go b/vendor/github.com/docker/spdystream/connection.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/spdystream/connection.go
rename to vendor/github.com/docker/spdystream/connection.go
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/handlers.go b/vendor/github.com/docker/spdystream/handlers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/spdystream/handlers.go
rename to vendor/github.com/docker/spdystream/handlers.go
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/priority.go b/vendor/github.com/docker/spdystream/priority.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/spdystream/priority.go
rename to vendor/github.com/docker/spdystream/priority.go
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/spdy/dictionary.go b/vendor/github.com/docker/spdystream/spdy/dictionary.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/spdystream/spdy/dictionary.go
rename to vendor/github.com/docker/spdystream/spdy/dictionary.go
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/spdy/read.go b/vendor/github.com/docker/spdystream/spdy/read.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/spdystream/spdy/read.go
rename to vendor/github.com/docker/spdystream/spdy/read.go
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/spdy/types.go b/vendor/github.com/docker/spdystream/spdy/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/spdystream/spdy/types.go
rename to vendor/github.com/docker/spdystream/spdy/types.go
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/spdy/write.go b/vendor/github.com/docker/spdystream/spdy/write.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/spdystream/spdy/write.go
rename to vendor/github.com/docker/spdystream/spdy/write.go
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/stream.go b/vendor/github.com/docker/spdystream/stream.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/spdystream/stream.go
rename to vendor/github.com/docker/spdystream/stream.go
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/utils.go b/vendor/github.com/docker/spdystream/utils.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/spdystream/utils.go
rename to vendor/github.com/docker/spdystream/utils.go
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/ws/connection.go b/vendor/github.com/docker/spdystream/ws/connection.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/spdystream/ws/connection.go
rename to vendor/github.com/docker/spdystream/ws/connection.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/LICENSE b/vendor/github.com/elazarl/go-bindata-assetfs/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/LICENSE
rename to vendor/github.com/elazarl/go-bindata-assetfs/LICENSE
diff --git a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/README.md b/vendor/github.com/elazarl/go-bindata-assetfs/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/README.md
rename to vendor/github.com/elazarl/go-bindata-assetfs/README.md
diff --git a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/assetfs.go b/vendor/github.com/elazarl/go-bindata-assetfs/assetfs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/assetfs.go
rename to vendor/github.com/elazarl/go-bindata-assetfs/assetfs.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/doc.go b/vendor/github.com/elazarl/go-bindata-assetfs/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/doc.go
rename to vendor/github.com/elazarl/go-bindata-assetfs/doc.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs/main.go b/vendor/github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs/main.go
rename to vendor/github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs/main.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/.gitignore b/vendor/github.com/elazarl/goproxy/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/.gitignore
rename to vendor/github.com/elazarl/goproxy/.gitignore
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/LICENSE b/vendor/github.com/elazarl/goproxy/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/LICENSE
rename to vendor/github.com/elazarl/goproxy/LICENSE
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/README.md b/vendor/github.com/elazarl/goproxy/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/README.md
rename to vendor/github.com/elazarl/goproxy/README.md
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/actions.go b/vendor/github.com/elazarl/goproxy/actions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/actions.go
rename to vendor/github.com/elazarl/goproxy/actions.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/all.bash b/vendor/github.com/elazarl/goproxy/all.bash
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/all.bash
rename to vendor/github.com/elazarl/goproxy/all.bash
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ca.pem b/vendor/github.com/elazarl/goproxy/ca.pem
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/ca.pem
rename to vendor/github.com/elazarl/goproxy/ca.pem
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/certs.go b/vendor/github.com/elazarl/goproxy/certs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/certs.go
rename to vendor/github.com/elazarl/goproxy/certs.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/chunked.go b/vendor/github.com/elazarl/goproxy/chunked.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/chunked.go
rename to vendor/github.com/elazarl/goproxy/chunked.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/counterecryptor.go b/vendor/github.com/elazarl/goproxy/counterecryptor.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/counterecryptor.go
rename to vendor/github.com/elazarl/goproxy/counterecryptor.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ctx.go b/vendor/github.com/elazarl/goproxy/ctx.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/ctx.go
rename to vendor/github.com/elazarl/goproxy/ctx.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/dispatcher.go b/vendor/github.com/elazarl/goproxy/dispatcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/dispatcher.go
rename to vendor/github.com/elazarl/goproxy/dispatcher.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/doc.go b/vendor/github.com/elazarl/goproxy/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/doc.go
rename to vendor/github.com/elazarl/goproxy/doc.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-basic/README.md b/vendor/github.com/elazarl/goproxy/examples/goproxy-basic/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-basic/README.md
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-basic/README.md
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-basic/main.go b/vendor/github.com/elazarl/goproxy/examples/goproxy-basic/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-basic/main.go
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-basic/main.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-eavesdropper/main.go b/vendor/github.com/elazarl/goproxy/examples/goproxy-eavesdropper/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-eavesdropper/main.go
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-eavesdropper/main.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-httpdump/README.md b/vendor/github.com/elazarl/goproxy/examples/goproxy-httpdump/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-httpdump/README.md
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-httpdump/README.md
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-httpdump/httpdump.go b/vendor/github.com/elazarl/goproxy/examples/goproxy-httpdump/httpdump.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-httpdump/httpdump.go
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-httpdump/httpdump.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/README.md b/vendor/github.com/elazarl/goproxy/examples/goproxy-jquery-version/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/README.md
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-jquery-version/README.md
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery1.html b/vendor/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery1.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery1.html
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery1.html
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery2.html b/vendor/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery2.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery2.html
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery2.html
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery_homepage.html b/vendor/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery_homepage.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery_homepage.html
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery_homepage.html
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/main.go b/vendor/github.com/elazarl/goproxy/examples/goproxy-jquery-version/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/main.go
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-jquery-version/main.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/php_man.html b/vendor/github.com/elazarl/goproxy/examples/goproxy-jquery-version/php_man.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/php_man.html
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-jquery-version/php_man.html
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/w3schools.html b/vendor/github.com/elazarl/goproxy/examples/goproxy-jquery-version/w3schools.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/w3schools.html
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-jquery-version/w3schools.html
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-no-reddit-at-worktime/README.md b/vendor/github.com/elazarl/goproxy/examples/goproxy-no-reddit-at-worktime/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-no-reddit-at-worktime/README.md
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-no-reddit-at-worktime/README.md
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-no-reddit-at-worktime/noreddit.go b/vendor/github.com/elazarl/goproxy/examples/goproxy-no-reddit-at-worktime/noreddit.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-no-reddit-at-worktime/noreddit.go
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-no-reddit-at-worktime/noreddit.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-sokeepalive/sokeepalive.go b/vendor/github.com/elazarl/goproxy/examples/goproxy-sokeepalive/sokeepalive.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-sokeepalive/sokeepalive.go
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-sokeepalive/sokeepalive.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-sslstrip/sslstrip.go b/vendor/github.com/elazarl/goproxy/examples/goproxy-sslstrip/sslstrip.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-sslstrip/sslstrip.go
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-sslstrip/sslstrip.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-stats/README.md b/vendor/github.com/elazarl/goproxy/examples/goproxy-stats/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-stats/README.md
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-stats/README.md
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-stats/main.go b/vendor/github.com/elazarl/goproxy/examples/goproxy-stats/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-stats/main.go
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-stats/main.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-transparent/README.md b/vendor/github.com/elazarl/goproxy/examples/goproxy-transparent/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-transparent/README.md
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-transparent/README.md
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-transparent/proxy.sh b/vendor/github.com/elazarl/goproxy/examples/goproxy-transparent/proxy.sh
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-transparent/proxy.sh
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-transparent/proxy.sh
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-transparent/transparent.go b/vendor/github.com/elazarl/goproxy/examples/goproxy-transparent/transparent.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-transparent/transparent.go
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-transparent/transparent.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-upside-down-ternet/main.go b/vendor/github.com/elazarl/goproxy/examples/goproxy-upside-down-ternet/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-upside-down-ternet/main.go
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-upside-down-ternet/main.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-yui-minify/yui.go b/vendor/github.com/elazarl/goproxy/examples/goproxy-yui-minify/yui.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-yui-minify/yui.go
rename to vendor/github.com/elazarl/goproxy/examples/goproxy-yui-minify/yui.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/auth/basic.go b/vendor/github.com/elazarl/goproxy/ext/auth/basic.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/ext/auth/basic.go
rename to vendor/github.com/elazarl/goproxy/ext/auth/basic.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/cp1255.html b/vendor/github.com/elazarl/goproxy/ext/html/cp1255.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/cp1255.html
rename to vendor/github.com/elazarl/goproxy/ext/html/cp1255.html
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/cp1255.txt b/vendor/github.com/elazarl/goproxy/ext/html/cp1255.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/cp1255.txt
rename to vendor/github.com/elazarl/goproxy/ext/html/cp1255.txt
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/html.go b/vendor/github.com/elazarl/goproxy/ext/html/html.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/html.go
rename to vendor/github.com/elazarl/goproxy/ext/html/html.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/image/image.go b/vendor/github.com/elazarl/goproxy/ext/image/image.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/ext/image/image.go
rename to vendor/github.com/elazarl/goproxy/ext/image/image.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/https.go b/vendor/github.com/elazarl/goproxy/https.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/https.go
rename to vendor/github.com/elazarl/goproxy/https.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/key.pem b/vendor/github.com/elazarl/goproxy/key.pem
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/key.pem
rename to vendor/github.com/elazarl/goproxy/key.pem
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/proxy.go b/vendor/github.com/elazarl/goproxy/proxy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/proxy.go
rename to vendor/github.com/elazarl/goproxy/proxy.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/regretable/regretreader.go b/vendor/github.com/elazarl/goproxy/regretable/regretreader.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/regretable/regretreader.go
rename to vendor/github.com/elazarl/goproxy/regretable/regretreader.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/responses.go b/vendor/github.com/elazarl/goproxy/responses.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/responses.go
rename to vendor/github.com/elazarl/goproxy/responses.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/signer.go b/vendor/github.com/elazarl/goproxy/signer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/signer.go
rename to vendor/github.com/elazarl/goproxy/signer.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/test_data/baby.jpg b/vendor/github.com/elazarl/goproxy/test_data/baby.jpg
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/test_data/baby.jpg
rename to vendor/github.com/elazarl/goproxy/test_data/baby.jpg
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/test_data/football.png b/vendor/github.com/elazarl/goproxy/test_data/football.png
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/test_data/football.png
rename to vendor/github.com/elazarl/goproxy/test_data/football.png
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/test_data/panda.png b/vendor/github.com/elazarl/goproxy/test_data/panda.png
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/test_data/panda.png
rename to vendor/github.com/elazarl/goproxy/test_data/panda.png
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/transport/roundtripper.go b/vendor/github.com/elazarl/goproxy/transport/roundtripper.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/transport/roundtripper.go
rename to vendor/github.com/elazarl/goproxy/transport/roundtripper.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/transport/transport.go b/vendor/github.com/elazarl/goproxy/transport/transport.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/transport/transport.go
rename to vendor/github.com/elazarl/goproxy/transport/transport.go
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/transport/util.go b/vendor/github.com/elazarl/goproxy/transport/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/elazarl/goproxy/transport/util.go
rename to vendor/github.com/elazarl/goproxy/transport/util.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/.gitignore b/vendor/github.com/emicklei/go-restful/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/.gitignore
rename to vendor/github.com/emicklei/go-restful/.gitignore
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/CHANGES.md b/vendor/github.com/emicklei/go-restful/CHANGES.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/CHANGES.md
rename to vendor/github.com/emicklei/go-restful/CHANGES.md
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/LICENSE b/vendor/github.com/emicklei/go-restful/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/LICENSE
rename to vendor/github.com/emicklei/go-restful/LICENSE
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/README.md b/vendor/github.com/emicklei/go-restful/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/README.md
rename to vendor/github.com/emicklei/go-restful/README.md
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/Srcfile b/vendor/github.com/emicklei/go-restful/Srcfile
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/Srcfile
rename to vendor/github.com/emicklei/go-restful/Srcfile
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/bench_test.sh b/vendor/github.com/emicklei/go-restful/bench_test.sh
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/bench_test.sh
rename to vendor/github.com/emicklei/go-restful/bench_test.sh
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/compress.go b/vendor/github.com/emicklei/go-restful/compress.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/compress.go
rename to vendor/github.com/emicklei/go-restful/compress.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/compressor_cache.go b/vendor/github.com/emicklei/go-restful/compressor_cache.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/compressor_cache.go
rename to vendor/github.com/emicklei/go-restful/compressor_cache.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/compressor_pools.go b/vendor/github.com/emicklei/go-restful/compressor_pools.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/compressor_pools.go
rename to vendor/github.com/emicklei/go-restful/compressor_pools.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/compressors.go b/vendor/github.com/emicklei/go-restful/compressors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/compressors.go
rename to vendor/github.com/emicklei/go-restful/compressors.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/constants.go b/vendor/github.com/emicklei/go-restful/constants.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/constants.go
rename to vendor/github.com/emicklei/go-restful/constants.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/container.go b/vendor/github.com/emicklei/go-restful/container.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/container.go
rename to vendor/github.com/emicklei/go-restful/container.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/cors_filter.go b/vendor/github.com/emicklei/go-restful/cors_filter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/cors_filter.go
rename to vendor/github.com/emicklei/go-restful/cors_filter.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/coverage.sh b/vendor/github.com/emicklei/go-restful/coverage.sh
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/coverage.sh
rename to vendor/github.com/emicklei/go-restful/coverage.sh
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/curly.go b/vendor/github.com/emicklei/go-restful/curly.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/curly.go
rename to vendor/github.com/emicklei/go-restful/curly.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/curly_route.go b/vendor/github.com/emicklei/go-restful/curly_route.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/curly_route.go
rename to vendor/github.com/emicklei/go-restful/curly_route.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/doc.go b/vendor/github.com/emicklei/go-restful/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/doc.go
rename to vendor/github.com/emicklei/go-restful/doc.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/entity_accessors.go b/vendor/github.com/emicklei/go-restful/entity_accessors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/entity_accessors.go
rename to vendor/github.com/emicklei/go-restful/entity_accessors.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/.goconvey b/vendor/github.com/emicklei/go-restful/examples/.goconvey
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/.goconvey
rename to vendor/github.com/emicklei/go-restful/examples/.goconvey
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/.goconvey b/vendor/github.com/emicklei/go-restful/examples/google_app_engine/.goconvey
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/.goconvey
rename to vendor/github.com/emicklei/go-restful/examples/google_app_engine/.goconvey
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/app.yaml b/vendor/github.com/emicklei/go-restful/examples/google_app_engine/app.yaml
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/app.yaml
rename to vendor/github.com/emicklei/go-restful/examples/google_app_engine/app.yaml
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/.goconvey b/vendor/github.com/emicklei/go-restful/examples/google_app_engine/datastore/.goconvey
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/.goconvey
rename to vendor/github.com/emicklei/go-restful/examples/google_app_engine/datastore/.goconvey
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/app.yaml b/vendor/github.com/emicklei/go-restful/examples/google_app_engine/datastore/app.yaml
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/app.yaml
rename to vendor/github.com/emicklei/go-restful/examples/google_app_engine/datastore/app.yaml
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/main.go b/vendor/github.com/emicklei/go-restful/examples/google_app_engine/datastore/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/datastore/main.go
rename to vendor/github.com/emicklei/go-restful/examples/google_app_engine/datastore/main.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-appstats-integration.go b/vendor/github.com/emicklei/go-restful/examples/google_app_engine/restful-appstats-integration.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-appstats-integration.go
rename to vendor/github.com/emicklei/go-restful/examples/google_app_engine/restful-appstats-integration.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-user-service.go b/vendor/github.com/emicklei/go-restful/examples/google_app_engine/restful-user-service.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/google_app_engine/restful-user-service.go
rename to vendor/github.com/emicklei/go-restful/examples/google_app_engine/restful-user-service.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/home.html b/vendor/github.com/emicklei/go-restful/examples/home.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/home.html
rename to vendor/github.com/emicklei/go-restful/examples/home.html
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-CORS-filter.go b/vendor/github.com/emicklei/go-restful/examples/restful-CORS-filter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-CORS-filter.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-CORS-filter.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-NCSA-logging.go b/vendor/github.com/emicklei/go-restful/examples/restful-NCSA-logging.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-NCSA-logging.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-NCSA-logging.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-basic-authentication.go b/vendor/github.com/emicklei/go-restful/examples/restful-basic-authentication.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-basic-authentication.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-basic-authentication.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-cpuprofiler-service.go b/vendor/github.com/emicklei/go-restful/examples/restful-cpuprofiler-service.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-cpuprofiler-service.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-cpuprofiler-service.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-curly-router.go b/vendor/github.com/emicklei/go-restful/examples/restful-curly-router.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-curly-router.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-curly-router.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-encoding-filter.go b/vendor/github.com/emicklei/go-restful/examples/restful-encoding-filter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-encoding-filter.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-encoding-filter.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-filters.go b/vendor/github.com/emicklei/go-restful/examples/restful-filters.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-filters.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-filters.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-form-handling.go b/vendor/github.com/emicklei/go-restful/examples/restful-form-handling.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-form-handling.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-form-handling.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-hello-world.go b/vendor/github.com/emicklei/go-restful/examples/restful-hello-world.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-hello-world.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-hello-world.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-html-template.go b/vendor/github.com/emicklei/go-restful/examples/restful-html-template.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-html-template.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-html-template.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-multi-containers.go b/vendor/github.com/emicklei/go-restful/examples/restful-multi-containers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-multi-containers.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-multi-containers.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-no-cache-filter.go b/vendor/github.com/emicklei/go-restful/examples/restful-no-cache-filter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-no-cache-filter.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-no-cache-filter.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-options-filter.go b/vendor/github.com/emicklei/go-restful/examples/restful-options-filter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-options-filter.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-options-filter.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-path-tail.go b/vendor/github.com/emicklei/go-restful/examples/restful-path-tail.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-path-tail.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-path-tail.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-pre-post-filters.go b/vendor/github.com/emicklei/go-restful/examples/restful-pre-post-filters.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-pre-post-filters.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-pre-post-filters.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-resource-functions.go b/vendor/github.com/emicklei/go-restful/examples/restful-resource-functions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-resource-functions.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-resource-functions.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-serve-static.go b/vendor/github.com/emicklei/go-restful/examples/restful-serve-static.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-serve-static.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-serve-static.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-swagger.go b/vendor/github.com/emicklei/go-restful/examples/restful-swagger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-swagger.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-swagger.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-resource.go b/vendor/github.com/emicklei/go-restful/examples/restful-user-resource.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-resource.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-user-resource.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-service.go b/vendor/github.com/emicklei/go-restful/examples/restful-user-service.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/examples/restful-user-service.go
rename to vendor/github.com/emicklei/go-restful/examples/restful-user-service.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/filter.go b/vendor/github.com/emicklei/go-restful/filter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/filter.go
rename to vendor/github.com/emicklei/go-restful/filter.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/install.sh b/vendor/github.com/emicklei/go-restful/install.sh
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/install.sh
rename to vendor/github.com/emicklei/go-restful/install.sh
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/jsr311.go b/vendor/github.com/emicklei/go-restful/jsr311.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/jsr311.go
rename to vendor/github.com/emicklei/go-restful/jsr311.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/log/log.go b/vendor/github.com/emicklei/go-restful/log/log.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/log/log.go
rename to vendor/github.com/emicklei/go-restful/log/log.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/logger.go b/vendor/github.com/emicklei/go-restful/logger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/logger.go
rename to vendor/github.com/emicklei/go-restful/logger.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/mime.go b/vendor/github.com/emicklei/go-restful/mime.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/mime.go
rename to vendor/github.com/emicklei/go-restful/mime.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/options_filter.go b/vendor/github.com/emicklei/go-restful/options_filter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/options_filter.go
rename to vendor/github.com/emicklei/go-restful/options_filter.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/parameter.go b/vendor/github.com/emicklei/go-restful/parameter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/parameter.go
rename to vendor/github.com/emicklei/go-restful/parameter.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/path_expression.go b/vendor/github.com/emicklei/go-restful/path_expression.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/path_expression.go
rename to vendor/github.com/emicklei/go-restful/path_expression.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/request.go b/vendor/github.com/emicklei/go-restful/request.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/request.go
rename to vendor/github.com/emicklei/go-restful/request.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/response.go b/vendor/github.com/emicklei/go-restful/response.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/response.go
rename to vendor/github.com/emicklei/go-restful/response.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/route.go b/vendor/github.com/emicklei/go-restful/route.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/route.go
rename to vendor/github.com/emicklei/go-restful/route.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/route_builder.go b/vendor/github.com/emicklei/go-restful/route_builder.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/route_builder.go
rename to vendor/github.com/emicklei/go-restful/route_builder.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/router.go b/vendor/github.com/emicklei/go-restful/router.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/router.go
rename to vendor/github.com/emicklei/go-restful/router.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/service_error.go b/vendor/github.com/emicklei/go-restful/service_error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/service_error.go
rename to vendor/github.com/emicklei/go-restful/service_error.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/CHANGES.md b/vendor/github.com/emicklei/go-restful/swagger/CHANGES.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/CHANGES.md
rename to vendor/github.com/emicklei/go-restful/swagger/CHANGES.md
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/README.md b/vendor/github.com/emicklei/go-restful/swagger/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/README.md
rename to vendor/github.com/emicklei/go-restful/swagger/README.md
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/api_declaration_list.go b/vendor/github.com/emicklei/go-restful/swagger/api_declaration_list.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/api_declaration_list.go
rename to vendor/github.com/emicklei/go-restful/swagger/api_declaration_list.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/config.go b/vendor/github.com/emicklei/go-restful/swagger/config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/config.go
rename to vendor/github.com/emicklei/go-restful/swagger/config.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder.go b/vendor/github.com/emicklei/go-restful/swagger/model_builder.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_builder.go
rename to vendor/github.com/emicklei/go-restful/swagger/model_builder.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_list.go b/vendor/github.com/emicklei/go-restful/swagger/model_list.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_list.go
rename to vendor/github.com/emicklei/go-restful/swagger/model_list.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_property_ext.go b/vendor/github.com/emicklei/go-restful/swagger/model_property_ext.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_property_ext.go
rename to vendor/github.com/emicklei/go-restful/swagger/model_property_ext.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_property_list.go b/vendor/github.com/emicklei/go-restful/swagger/model_property_list.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/model_property_list.go
rename to vendor/github.com/emicklei/go-restful/swagger/model_property_list.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/ordered_route_map.go b/vendor/github.com/emicklei/go-restful/swagger/ordered_route_map.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/ordered_route_map.go
rename to vendor/github.com/emicklei/go-restful/swagger/ordered_route_map.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger.go b/vendor/github.com/emicklei/go-restful/swagger/swagger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger.go
rename to vendor/github.com/emicklei/go-restful/swagger/swagger.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_builder.go b/vendor/github.com/emicklei/go-restful/swagger/swagger_builder.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_builder.go
rename to vendor/github.com/emicklei/go-restful/swagger/swagger_builder.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_webservice.go b/vendor/github.com/emicklei/go-restful/swagger/swagger_webservice.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/swagger_webservice.go
rename to vendor/github.com/emicklei/go-restful/swagger/swagger_webservice.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/test_package/struct.go b/vendor/github.com/emicklei/go-restful/swagger/test_package/struct.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/swagger/test_package/struct.go
rename to vendor/github.com/emicklei/go-restful/swagger/test_package/struct.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service.go b/vendor/github.com/emicklei/go-restful/web_service.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/web_service.go
rename to vendor/github.com/emicklei/go-restful/web_service.go
diff --git a/Godeps/_workspace/src/github.com/emicklei/go-restful/web_service_container.go b/vendor/github.com/emicklei/go-restful/web_service_container.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/emicklei/go-restful/web_service_container.go
rename to vendor/github.com/emicklei/go-restful/web_service_container.go
diff --git a/Godeps/_workspace/src/github.com/evanphx/json-patch/.travis.yml b/vendor/github.com/evanphx/json-patch/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/evanphx/json-patch/.travis.yml
rename to vendor/github.com/evanphx/json-patch/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/evanphx/json-patch/LICENSE b/vendor/github.com/evanphx/json-patch/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/evanphx/json-patch/LICENSE
rename to vendor/github.com/evanphx/json-patch/LICENSE
diff --git a/Godeps/_workspace/src/github.com/evanphx/json-patch/README.md b/vendor/github.com/evanphx/json-patch/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/evanphx/json-patch/README.md
rename to vendor/github.com/evanphx/json-patch/README.md
diff --git a/Godeps/_workspace/src/github.com/evanphx/json-patch/merge.go b/vendor/github.com/evanphx/json-patch/merge.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/evanphx/json-patch/merge.go
rename to vendor/github.com/evanphx/json-patch/merge.go
diff --git a/Godeps/_workspace/src/github.com/evanphx/json-patch/patch.go b/vendor/github.com/evanphx/json-patch/patch.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/evanphx/json-patch/patch.go
rename to vendor/github.com/evanphx/json-patch/patch.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.gitignore b/vendor/github.com/fsouza/go-dockerclient/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.gitignore
rename to vendor/github.com/fsouza/go-dockerclient/.gitignore
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.travis.yml b/vendor/github.com/fsouza/go-dockerclient/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.travis.yml
rename to vendor/github.com/fsouza/go-dockerclient/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/AUTHORS b/vendor/github.com/fsouza/go-dockerclient/AUTHORS
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/AUTHORS
rename to vendor/github.com/fsouza/go-dockerclient/AUTHORS
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/DOCKER-LICENSE b/vendor/github.com/fsouza/go-dockerclient/DOCKER-LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/DOCKER-LICENSE
rename to vendor/github.com/fsouza/go-dockerclient/DOCKER-LICENSE
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE b/vendor/github.com/fsouza/go-dockerclient/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE
rename to vendor/github.com/fsouza/go-dockerclient/LICENSE
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/Makefile b/vendor/github.com/fsouza/go-dockerclient/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/Makefile
rename to vendor/github.com/fsouza/go-dockerclient/Makefile
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/README.markdown b/vendor/github.com/fsouza/go-dockerclient/README.markdown
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/README.markdown
rename to vendor/github.com/fsouza/go-dockerclient/README.markdown
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/auth.go b/vendor/github.com/fsouza/go-dockerclient/auth.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/auth.go
rename to vendor/github.com/fsouza/go-dockerclient/auth.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change.go b/vendor/github.com/fsouza/go-dockerclient/change.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change.go
rename to vendor/github.com/fsouza/go-dockerclient/change.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client.go b/vendor/github.com/fsouza/go-dockerclient/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client.go
rename to vendor/github.com/fsouza/go-dockerclient/client.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container.go b/vendor/github.com/fsouza/go-dockerclient/container.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container.go
rename to vendor/github.com/fsouza/go-dockerclient/container.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env.go b/vendor/github.com/fsouza/go-dockerclient/env.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env.go
rename to vendor/github.com/fsouza/go-dockerclient/env.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event.go b/vendor/github.com/fsouza/go-dockerclient/event.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event.go
rename to vendor/github.com/fsouza/go-dockerclient/event.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec.go b/vendor/github.com/fsouza/go-dockerclient/exec.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec.go
rename to vendor/github.com/fsouza/go-dockerclient/exec.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/CHANGELOG.md b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/CHANGELOG.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/CHANGELOG.md
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/CHANGELOG.md
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/Sirupsen/logrus/LICENSE b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/Sirupsen/logrus/LICENSE
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/LICENSE
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/README.md b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/README.md
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/README.md
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/doc.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/doc.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/doc.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/entry.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/entry.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/entry.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/entry.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/exported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/exported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/exported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/exported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/formatter.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/formatter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/formatter.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/formatter.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/hooks.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/hooks.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/hooks.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/hooks.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/json_formatter.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/json_formatter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/json_formatter.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/json_formatter.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logger.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logger.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logger.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logrus.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logrus.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logrus.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logrus.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_bsd.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_bsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_bsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_bsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_notwindows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_notwindows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_notwindows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_notwindows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_solaris.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_solaris.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_solaris.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_solaris.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/text_formatter.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/text_formatter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/text_formatter.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/text_formatter.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/writer.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/writer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/writer.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/writer.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/envfile.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/envfile.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/envfile.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/envfile.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/ip.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/ip.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/ip.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/ip.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/README.md b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/README.md
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/README.md
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_other.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_other.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_other.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_other.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/diff.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/diff.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/diff.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/diff.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/example_changes.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/example_changes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/example_changes.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/example_changes.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_unsupported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_unsupported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/whiteouts.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/whiteouts.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/whiteouts.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/whiteouts.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/wrap.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/wrap.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/wrap.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/wrap.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/homedir/homedir.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/homedir/homedir.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/homedir/homedir.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/homedir/homedir.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/bytespipe.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/bytespipe.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/bytespipe.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/bytespipe.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/fmt.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/fmt.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/fmt.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/fmt.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/multireader.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/multireader.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/multireader.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/multireader.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/readers.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/readers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/readers.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/readers.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler_gccgo.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler_gccgo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler_gccgo.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler_gccgo.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writeflusher.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writeflusher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writeflusher.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writeflusher.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writers.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writers.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writers.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/longpath/longpath.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/longpath/longpath.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/longpath/longpath.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/longpath/longpath.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/pools/pools.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/pools/pools.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/pools/pools.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/pools/pools.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/promise/promise.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/promise/promise.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/promise/promise.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/promise/promise.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy/stdcopy.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy/stdcopy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy/stdcopy.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy/stdcopy.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/errors.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/errors.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/errors.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/events_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/events_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/events_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/events_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_unsupported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_unsupported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_freebsd.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_freebsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_openbsd.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_openbsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_openbsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_openbsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_solaris.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_solaris.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_solaris.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_solaris.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_unsupported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_unsupported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_darwin.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_darwin.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_darwin.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_freebsd.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_freebsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_unsupported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_unsupported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_unsupported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_unsupported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/CONTRIBUTING.md b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/CONTRIBUTING.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/CONTRIBUTING.md
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/CONTRIBUTING.md
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.code b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.code
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.code
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.code
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.docs b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.docs
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.docs
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.docs
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/MAINTAINERS b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/MAINTAINERS
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/MAINTAINERS
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/MAINTAINERS
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/README.md b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/README.md
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/README.md
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/circle.yml b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/circle.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/circle.yml
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/circle.yml
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/duration.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/duration.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/duration.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/duration.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/size.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/size.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/size.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/size.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/ulimit.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/ulimit.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/ulimit.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/ulimit.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/gorilla/context/LICENSE b/vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/gorilla/context/LICENSE
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/LICENSE
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/README.md b/vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/README.md
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/README.md
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/context.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/context.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/context.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/context.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/doc.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/doc.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/doc.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/gorilla/mux/LICENSE b/vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/gorilla/mux/LICENSE
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/LICENSE
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/README.md b/vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/README.md
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/README.md
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/doc.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/doc.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/doc.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/mux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/mux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/mux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/mux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/regexp.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/regexp.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/regexp.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/regexp.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/route.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/route.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/route.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/route.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/LICENSE b/vendor/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/LICENSE
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/LICENSE
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/README.md b/vendor/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/README.md
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/README.md
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/cleanhttp.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/cleanhttp.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/cleanhttp.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/cleanhttp.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS b/vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/user.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/user.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/user.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/user.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/net/context/context.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/net/context/context.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/net/context/context.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/net/context/context.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_386.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_386.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_386.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_386.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_amd64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_amd64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_amd64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_386.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_386.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_386.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_386.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_amd64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_amd64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_amd64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_386.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_386.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_386.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_386.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_amd64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_amd64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_amd64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_arm.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_arm.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_arm.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_arm.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_386.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_386.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_386.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_386.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_amd64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_amd64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_amd64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_ppc64x.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_ppc64x.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_ppc64x.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_ppc64x.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_386.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_386.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_386.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_386.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_amd64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_amd64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_amd64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_arm.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_arm.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_arm.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_arm.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_386.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_386.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_386.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_386.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_amd64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_amd64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_amd64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_solaris_amd64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_solaris_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_solaris_amd64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_solaris_amd64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/constants.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/constants.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/constants.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/constants.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unset.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unset.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unset.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unset.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock_linux_32bit.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock_linux_32bit.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock_linux_32bit.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock_linux_32bit.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_c.c b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_c.c
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_c.c
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_c.c
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_linux_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_linux_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_linux_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_linux_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkall.sh b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkall.sh
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkall.sh
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkall.sh
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkerrors.sh b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkerrors.sh
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkerrors.sh
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkerrors.sh
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall_solaris.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall_solaris.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall_solaris.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall_solaris.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysctl_openbsd.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysctl_openbsd.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysctl_openbsd.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysctl_openbsd.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_darwin.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_darwin.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_darwin.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_darwin.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_dragonfly.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_dragonfly.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_dragonfly.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_dragonfly.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_freebsd.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_freebsd.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_freebsd.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_freebsd.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_linux.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_linux.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_linux.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_linux.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_netbsd.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_netbsd.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_netbsd.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_netbsd.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_openbsd.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_openbsd.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_openbsd.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_openbsd.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race0.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race0.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race0.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race0.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/str.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/str.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/str.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/str.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_bsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_bsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_bsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_bsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_ppc64x.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_ppc64x.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_ppc64x.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_no_getwd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_no_getwd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_no_getwd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_no_getwd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_darwin.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_darwin.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_darwin.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_dragonfly.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_dragonfly.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_dragonfly.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_dragonfly.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_freebsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_freebsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_netbsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_netbsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_netbsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_netbsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_openbsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_openbsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_openbsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_openbsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_solaris.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_solaris.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_solaris.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_solaris.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_solaris_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_solaris_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_solaris_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_solaris_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_solaris_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysctl_openbsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysctl_openbsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysctl_openbsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysctl_openbsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_solaris_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_solaris_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_solaris_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_solaris_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_solaris_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image.go b/vendor/github.com/fsouza/go-dockerclient/image.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image.go
rename to vendor/github.com/fsouza/go-dockerclient/image.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc.go b/vendor/github.com/fsouza/go-dockerclient/misc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc.go
rename to vendor/github.com/fsouza/go-dockerclient/misc.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/network.go b/vendor/github.com/fsouza/go-dockerclient/network.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/network.go
rename to vendor/github.com/fsouza/go-dockerclient/network.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/signal.go b/vendor/github.com/fsouza/go-dockerclient/signal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/signal.go
rename to vendor/github.com/fsouza/go-dockerclient/signal.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/tar.go b/vendor/github.com/fsouza/go-dockerclient/tar.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/tar.go
rename to vendor/github.com/fsouza/go-dockerclient/tar.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/.dockerignore b/vendor/github.com/fsouza/go-dockerclient/testing/data/.dockerignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/.dockerignore
rename to vendor/github.com/fsouza/go-dockerclient/testing/data/.dockerignore
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile b/vendor/github.com/fsouza/go-dockerclient/testing/data/Dockerfile
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile
rename to vendor/github.com/fsouza/go-dockerclient/testing/data/Dockerfile
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/barfile b/vendor/github.com/fsouza/go-dockerclient/testing/data/barfile
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/barfile
rename to vendor/github.com/fsouza/go-dockerclient/testing/data/barfile
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/ca.pem b/vendor/github.com/fsouza/go-dockerclient/testing/data/ca.pem
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/ca.pem
rename to vendor/github.com/fsouza/go-dockerclient/testing/data/ca.pem
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/cert.pem b/vendor/github.com/fsouza/go-dockerclient/testing/data/cert.pem
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/cert.pem
rename to vendor/github.com/fsouza/go-dockerclient/testing/data/cert.pem
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/container.tar b/vendor/github.com/fsouza/go-dockerclient/testing/data/container.tar
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/container.tar
rename to vendor/github.com/fsouza/go-dockerclient/testing/data/container.tar
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar b/vendor/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar
rename to vendor/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/foofile b/vendor/github.com/fsouza/go-dockerclient/testing/data/foofile
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/foofile
rename to vendor/github.com/fsouza/go-dockerclient/testing/data/foofile
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/key.pem b/vendor/github.com/fsouza/go-dockerclient/testing/data/key.pem
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/key.pem
rename to vendor/github.com/fsouza/go-dockerclient/testing/data/key.pem
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/server.pem b/vendor/github.com/fsouza/go-dockerclient/testing/data/server.pem
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/server.pem
rename to vendor/github.com/fsouza/go-dockerclient/testing/data/server.pem
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/serverkey.pem b/vendor/github.com/fsouza/go-dockerclient/testing/data/serverkey.pem
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/serverkey.pem
rename to vendor/github.com/fsouza/go-dockerclient/testing/data/serverkey.pem
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server.go b/vendor/github.com/fsouza/go-dockerclient/testing/server.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server.go
rename to vendor/github.com/fsouza/go-dockerclient/testing/server.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/tls.go b/vendor/github.com/fsouza/go-dockerclient/tls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/tls.go
rename to vendor/github.com/fsouza/go-dockerclient/tls.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/travis-scripts/install.bash b/vendor/github.com/fsouza/go-dockerclient/travis-scripts/install.bash
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/travis-scripts/install.bash
rename to vendor/github.com/fsouza/go-dockerclient/travis-scripts/install.bash
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/travis-scripts/run-tests.bash b/vendor/github.com/fsouza/go-dockerclient/travis-scripts/run-tests.bash
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/travis-scripts/run-tests.bash
rename to vendor/github.com/fsouza/go-dockerclient/travis-scripts/run-tests.bash
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/volume.go b/vendor/github.com/fsouza/go-dockerclient/volume.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/volume.go
rename to vendor/github.com/fsouza/go-dockerclient/volume.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/internal/commandinfo.go b/vendor/github.com/garyburd/redigo/internal/commandinfo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/garyburd/redigo/internal/commandinfo.go
rename to vendor/github.com/garyburd/redigo/internal/commandinfo.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/internal/redistest/testdb.go b/vendor/github.com/garyburd/redigo/internal/redistest/testdb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/garyburd/redigo/internal/redistest/testdb.go
rename to vendor/github.com/garyburd/redigo/internal/redistest/testdb.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/conn.go b/vendor/github.com/garyburd/redigo/redis/conn.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/conn.go
rename to vendor/github.com/garyburd/redigo/redis/conn.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/doc.go b/vendor/github.com/garyburd/redigo/redis/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/doc.go
rename to vendor/github.com/garyburd/redigo/redis/doc.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/log.go b/vendor/github.com/garyburd/redigo/redis/log.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/log.go
rename to vendor/github.com/garyburd/redigo/redis/log.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool.go b/vendor/github.com/garyburd/redigo/redis/pool.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool.go
rename to vendor/github.com/garyburd/redigo/redis/pool.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub.go b/vendor/github.com/garyburd/redigo/redis/pubsub.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub.go
rename to vendor/github.com/garyburd/redigo/redis/pubsub.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/redis.go b/vendor/github.com/garyburd/redigo/redis/redis.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/redis.go
rename to vendor/github.com/garyburd/redigo/redis/redis.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply.go b/vendor/github.com/garyburd/redigo/redis/reply.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply.go
rename to vendor/github.com/garyburd/redigo/redis/reply.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/scan.go b/vendor/github.com/garyburd/redigo/redis/scan.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/scan.go
rename to vendor/github.com/garyburd/redigo/redis/scan.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/script.go b/vendor/github.com/garyburd/redigo/redis/script.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/garyburd/redigo/redis/script.go
rename to vendor/github.com/garyburd/redigo/redis/script.go
diff --git a/Godeps/_workspace/src/github.com/ghodss/yaml/.gitignore b/vendor/github.com/ghodss/yaml/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/ghodss/yaml/.gitignore
rename to vendor/github.com/ghodss/yaml/.gitignore
diff --git a/Godeps/_workspace/src/github.com/ghodss/yaml/.travis.yml b/vendor/github.com/ghodss/yaml/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/ghodss/yaml/.travis.yml
rename to vendor/github.com/ghodss/yaml/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/ghodss/yaml/LICENSE b/vendor/github.com/ghodss/yaml/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/ghodss/yaml/LICENSE
rename to vendor/github.com/ghodss/yaml/LICENSE
diff --git a/Godeps/_workspace/src/github.com/ghodss/yaml/README.md b/vendor/github.com/ghodss/yaml/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/ghodss/yaml/README.md
rename to vendor/github.com/ghodss/yaml/README.md
diff --git a/Godeps/_workspace/src/github.com/ghodss/yaml/fields.go b/vendor/github.com/ghodss/yaml/fields.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ghodss/yaml/fields.go
rename to vendor/github.com/ghodss/yaml/fields.go
diff --git a/Godeps/_workspace/src/github.com/ghodss/yaml/yaml.go b/vendor/github.com/ghodss/yaml/yaml.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ghodss/yaml/yaml.go
rename to vendor/github.com/ghodss/yaml/yaml.go
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/.gitignore b/vendor/github.com/go-ini/ini/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/go-ini/ini/.gitignore
rename to vendor/github.com/go-ini/ini/.gitignore
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/go-ini/ini/LICENSE b/vendor/github.com/go-ini/ini/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/go-ini/ini/LICENSE
rename to vendor/github.com/go-ini/ini/LICENSE
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/README.md b/vendor/github.com/go-ini/ini/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/go-ini/ini/README.md
rename to vendor/github.com/go-ini/ini/README.md
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/README_ZH.md b/vendor/github.com/go-ini/ini/README_ZH.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/go-ini/ini/README_ZH.md
rename to vendor/github.com/go-ini/ini/README_ZH.md
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/ini.go b/vendor/github.com/go-ini/ini/ini.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/go-ini/ini/ini.go
rename to vendor/github.com/go-ini/ini/ini.go
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/struct.go b/vendor/github.com/go-ini/ini/struct.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/go-ini/ini/struct.go
rename to vendor/github.com/go-ini/ini/struct.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/CONTRIBUTING.md b/vendor/github.com/godbus/dbus/CONTRIBUTING.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/CONTRIBUTING.md
rename to vendor/github.com/godbus/dbus/CONTRIBUTING.md
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/godbus/dbus/LICENSE b/vendor/github.com/godbus/dbus/LICENSE
similarity index 94%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/godbus/dbus/LICENSE
rename to vendor/github.com/godbus/dbus/LICENSE
index 06b252bcbc..670d88fcaa 100644
--- a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/godbus/dbus/LICENSE
+++ b/vendor/github.com/godbus/dbus/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013, Georg Reinke (<guelfey at gmail dot com>)
+Copyright (c) 2013, Georg Reinke (<guelfey at gmail dot com>), Google
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/MAINTAINERS b/vendor/github.com/godbus/dbus/MAINTAINERS
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/MAINTAINERS
rename to vendor/github.com/godbus/dbus/MAINTAINERS
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/README.markdown b/vendor/github.com/godbus/dbus/README.markdown
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/README.markdown
rename to vendor/github.com/godbus/dbus/README.markdown
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/auth.go b/vendor/github.com/godbus/dbus/auth.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/auth.go
rename to vendor/github.com/godbus/dbus/auth.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/auth_external.go b/vendor/github.com/godbus/dbus/auth_external.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/auth_external.go
rename to vendor/github.com/godbus/dbus/auth_external.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/auth_sha1.go b/vendor/github.com/godbus/dbus/auth_sha1.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/auth_sha1.go
rename to vendor/github.com/godbus/dbus/auth_sha1.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/call.go b/vendor/github.com/godbus/dbus/call.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/call.go
rename to vendor/github.com/godbus/dbus/call.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/conn.go b/vendor/github.com/godbus/dbus/conn.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/conn.go
rename to vendor/github.com/godbus/dbus/conn.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/conn_darwin.go b/vendor/github.com/godbus/dbus/conn_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/conn_darwin.go
rename to vendor/github.com/godbus/dbus/conn_darwin.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/conn_other.go b/vendor/github.com/godbus/dbus/conn_other.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/conn_other.go
rename to vendor/github.com/godbus/dbus/conn_other.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/dbus.go b/vendor/github.com/godbus/dbus/dbus.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/dbus.go
rename to vendor/github.com/godbus/dbus/dbus.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/decoder.go b/vendor/github.com/godbus/dbus/decoder.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/decoder.go
rename to vendor/github.com/godbus/dbus/decoder.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/doc.go b/vendor/github.com/godbus/dbus/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/doc.go
rename to vendor/github.com/godbus/dbus/doc.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/encoder.go b/vendor/github.com/godbus/dbus/encoder.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/encoder.go
rename to vendor/github.com/godbus/dbus/encoder.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/export.go b/vendor/github.com/godbus/dbus/export.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/export.go
rename to vendor/github.com/godbus/dbus/export.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/homedir.go b/vendor/github.com/godbus/dbus/homedir.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/homedir.go
rename to vendor/github.com/godbus/dbus/homedir.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/homedir_dynamic.go b/vendor/github.com/godbus/dbus/homedir_dynamic.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/homedir_dynamic.go
rename to vendor/github.com/godbus/dbus/homedir_dynamic.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/homedir_static.go b/vendor/github.com/godbus/dbus/homedir_static.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/homedir_static.go
rename to vendor/github.com/godbus/dbus/homedir_static.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/introspect/call.go b/vendor/github.com/godbus/dbus/introspect/call.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/introspect/call.go
rename to vendor/github.com/godbus/dbus/introspect/call.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/introspect/introspect.go b/vendor/github.com/godbus/dbus/introspect/introspect.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/introspect/introspect.go
rename to vendor/github.com/godbus/dbus/introspect/introspect.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/introspect/introspectable.go b/vendor/github.com/godbus/dbus/introspect/introspectable.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/introspect/introspectable.go
rename to vendor/github.com/godbus/dbus/introspect/introspectable.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/message.go b/vendor/github.com/godbus/dbus/message.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/message.go
rename to vendor/github.com/godbus/dbus/message.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/object.go b/vendor/github.com/godbus/dbus/object.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/object.go
rename to vendor/github.com/godbus/dbus/object.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/prop/prop.go b/vendor/github.com/godbus/dbus/prop/prop.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/prop/prop.go
rename to vendor/github.com/godbus/dbus/prop/prop.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/sig.go b/vendor/github.com/godbus/dbus/sig.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/sig.go
rename to vendor/github.com/godbus/dbus/sig.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/transport_darwin.go b/vendor/github.com/godbus/dbus/transport_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/transport_darwin.go
rename to vendor/github.com/godbus/dbus/transport_darwin.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/transport_generic.go b/vendor/github.com/godbus/dbus/transport_generic.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/transport_generic.go
rename to vendor/github.com/godbus/dbus/transport_generic.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/transport_unix.go b/vendor/github.com/godbus/dbus/transport_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/transport_unix.go
rename to vendor/github.com/godbus/dbus/transport_unix.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_dragonfly.go b/vendor/github.com/godbus/dbus/transport_unixcred_dragonfly.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_dragonfly.go
rename to vendor/github.com/godbus/dbus/transport_unixcred_dragonfly.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_linux.go b/vendor/github.com/godbus/dbus/transport_unixcred_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_linux.go
rename to vendor/github.com/godbus/dbus/transport_unixcred_linux.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/variant.go b/vendor/github.com/godbus/dbus/variant.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/variant.go
rename to vendor/github.com/godbus/dbus/variant.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/variant_lexer.go b/vendor/github.com/godbus/dbus/variant_lexer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/variant_lexer.go
rename to vendor/github.com/godbus/dbus/variant_lexer.go
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/variant_parser.go b/vendor/github.com/godbus/dbus/variant_parser.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/godbus/dbus/variant_parser.go
rename to vendor/github.com/godbus/dbus/variant_parser.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/gogo/protobuf/LICENSE b/vendor/github.com/gogo/protobuf/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/gogo/protobuf/LICENSE
rename to vendor/github.com/gogo/protobuf/LICENSE
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/gogoproto/Makefile b/vendor/github.com/gogo/protobuf/gogoproto/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/gogoproto/Makefile
rename to vendor/github.com/gogo/protobuf/gogoproto/Makefile
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/gogoproto/doc.go b/vendor/github.com/gogo/protobuf/gogoproto/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/gogoproto/doc.go
rename to vendor/github.com/gogo/protobuf/gogoproto/doc.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/gogoproto/gogo.pb.go b/vendor/github.com/gogo/protobuf/gogoproto/gogo.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/gogoproto/gogo.pb.go
rename to vendor/github.com/gogo/protobuf/gogoproto/gogo.pb.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/gogoproto/gogo.pb.golden b/vendor/github.com/gogo/protobuf/gogoproto/gogo.pb.golden
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/gogoproto/gogo.pb.golden
rename to vendor/github.com/gogo/protobuf/gogoproto/gogo.pb.golden
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/gogoproto/gogo.proto b/vendor/github.com/gogo/protobuf/gogoproto/gogo.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/gogoproto/gogo.proto
rename to vendor/github.com/gogo/protobuf/gogoproto/gogo.proto
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/gogoproto/helper.go b/vendor/github.com/gogo/protobuf/gogoproto/helper.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/gogoproto/helper.go
rename to vendor/github.com/gogo/protobuf/gogoproto/helper.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/defaultcheck/defaultcheck.go b/vendor/github.com/gogo/protobuf/plugin/defaultcheck/defaultcheck.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/defaultcheck/defaultcheck.go
rename to vendor/github.com/gogo/protobuf/plugin/defaultcheck/defaultcheck.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/description/description.go b/vendor/github.com/gogo/protobuf/plugin/description/description.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/description/description.go
rename to vendor/github.com/gogo/protobuf/plugin/description/description.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/description/descriptiontest.go b/vendor/github.com/gogo/protobuf/plugin/description/descriptiontest.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/description/descriptiontest.go
rename to vendor/github.com/gogo/protobuf/plugin/description/descriptiontest.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/embedcheck/embedcheck.go b/vendor/github.com/gogo/protobuf/plugin/embedcheck/embedcheck.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/embedcheck/embedcheck.go
rename to vendor/github.com/gogo/protobuf/plugin/embedcheck/embedcheck.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/enumstringer/enumstringer.go b/vendor/github.com/gogo/protobuf/plugin/enumstringer/enumstringer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/enumstringer/enumstringer.go
rename to vendor/github.com/gogo/protobuf/plugin/enumstringer/enumstringer.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/equal/equal.go b/vendor/github.com/gogo/protobuf/plugin/equal/equal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/equal/equal.go
rename to vendor/github.com/gogo/protobuf/plugin/equal/equal.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/equal/equaltest.go b/vendor/github.com/gogo/protobuf/plugin/equal/equaltest.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/equal/equaltest.go
rename to vendor/github.com/gogo/protobuf/plugin/equal/equaltest.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/face/face.go b/vendor/github.com/gogo/protobuf/plugin/face/face.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/face/face.go
rename to vendor/github.com/gogo/protobuf/plugin/face/face.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/face/facetest.go b/vendor/github.com/gogo/protobuf/plugin/face/facetest.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/face/facetest.go
rename to vendor/github.com/gogo/protobuf/plugin/face/facetest.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/gostring/gostring.go b/vendor/github.com/gogo/protobuf/plugin/gostring/gostring.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/gostring/gostring.go
rename to vendor/github.com/gogo/protobuf/plugin/gostring/gostring.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/gostring/gostringtest.go b/vendor/github.com/gogo/protobuf/plugin/gostring/gostringtest.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/gostring/gostringtest.go
rename to vendor/github.com/gogo/protobuf/plugin/gostring/gostringtest.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/grpc/grpc.go b/vendor/github.com/gogo/protobuf/plugin/grpc/grpc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/grpc/grpc.go
rename to vendor/github.com/gogo/protobuf/plugin/grpc/grpc.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/marshalto/marshalto.go b/vendor/github.com/gogo/protobuf/plugin/marshalto/marshalto.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/marshalto/marshalto.go
rename to vendor/github.com/gogo/protobuf/plugin/marshalto/marshalto.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/oneofcheck/oneofcheck.go b/vendor/github.com/gogo/protobuf/plugin/oneofcheck/oneofcheck.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/oneofcheck/oneofcheck.go
rename to vendor/github.com/gogo/protobuf/plugin/oneofcheck/oneofcheck.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/populate/populate.go b/vendor/github.com/gogo/protobuf/plugin/populate/populate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/populate/populate.go
rename to vendor/github.com/gogo/protobuf/plugin/populate/populate.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/size/size.go b/vendor/github.com/gogo/protobuf/plugin/size/size.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/size/size.go
rename to vendor/github.com/gogo/protobuf/plugin/size/size.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/size/sizetest.go b/vendor/github.com/gogo/protobuf/plugin/size/sizetest.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/size/sizetest.go
rename to vendor/github.com/gogo/protobuf/plugin/size/sizetest.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/stringer/stringer.go b/vendor/github.com/gogo/protobuf/plugin/stringer/stringer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/stringer/stringer.go
rename to vendor/github.com/gogo/protobuf/plugin/stringer/stringer.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/stringer/stringertest.go b/vendor/github.com/gogo/protobuf/plugin/stringer/stringertest.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/stringer/stringertest.go
rename to vendor/github.com/gogo/protobuf/plugin/stringer/stringertest.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/testgen/testgen.go b/vendor/github.com/gogo/protobuf/plugin/testgen/testgen.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/testgen/testgen.go
rename to vendor/github.com/gogo/protobuf/plugin/testgen/testgen.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/union/union.go b/vendor/github.com/gogo/protobuf/plugin/union/union.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/union/union.go
rename to vendor/github.com/gogo/protobuf/plugin/union/union.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/union/uniontest.go b/vendor/github.com/gogo/protobuf/plugin/union/uniontest.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/union/uniontest.go
rename to vendor/github.com/gogo/protobuf/plugin/union/uniontest.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/plugin/unmarshal/unmarshal.go b/vendor/github.com/gogo/protobuf/plugin/unmarshal/unmarshal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/plugin/unmarshal/unmarshal.go
rename to vendor/github.com/gogo/protobuf/plugin/unmarshal/unmarshal.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/Makefile b/vendor/github.com/gogo/protobuf/proto/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/Makefile
rename to vendor/github.com/gogo/protobuf/proto/Makefile
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone.go b/vendor/github.com/gogo/protobuf/proto/clone.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone.go
rename to vendor/github.com/gogo/protobuf/proto/clone.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode.go b/vendor/github.com/gogo/protobuf/proto/decode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode.go
rename to vendor/github.com/gogo/protobuf/proto/decode.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode_gogo.go b/vendor/github.com/gogo/protobuf/proto/decode_gogo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode_gogo.go
rename to vendor/github.com/gogo/protobuf/proto/decode_gogo.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go b/vendor/github.com/gogo/protobuf/proto/encode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go
rename to vendor/github.com/gogo/protobuf/proto/encode.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode_gogo.go b/vendor/github.com/gogo/protobuf/proto/encode_gogo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode_gogo.go
rename to vendor/github.com/gogo/protobuf/proto/encode_gogo.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go b/vendor/github.com/gogo/protobuf/proto/equal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go
rename to vendor/github.com/gogo/protobuf/proto/equal.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go b/vendor/github.com/gogo/protobuf/proto/extensions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go
rename to vendor/github.com/gogo/protobuf/proto/extensions.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_gogo.go b/vendor/github.com/gogo/protobuf/proto/extensions_gogo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_gogo.go
rename to vendor/github.com/gogo/protobuf/proto/extensions_gogo.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go b/vendor/github.com/gogo/protobuf/proto/lib.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go
rename to vendor/github.com/gogo/protobuf/proto/lib.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib_gogo.go b/vendor/github.com/gogo/protobuf/proto/lib_gogo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib_gogo.go
rename to vendor/github.com/gogo/protobuf/proto/lib_gogo.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set.go b/vendor/github.com/gogo/protobuf/proto/message_set.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set.go
rename to vendor/github.com/gogo/protobuf/proto/message_set.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_reflect.go b/vendor/github.com/gogo/protobuf/proto/pointer_reflect.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_reflect.go
rename to vendor/github.com/gogo/protobuf/proto/pointer_reflect.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe.go b/vendor/github.com/gogo/protobuf/proto/pointer_unsafe.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe.go
rename to vendor/github.com/gogo/protobuf/proto/pointer_unsafe.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go b/vendor/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
rename to vendor/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go b/vendor/github.com/gogo/protobuf/proto/properties.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go
rename to vendor/github.com/gogo/protobuf/proto/properties.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties_gogo.go b/vendor/github.com/gogo/protobuf/proto/properties_gogo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties_gogo.go
rename to vendor/github.com/gogo/protobuf/proto/properties_gogo.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/proto3_proto/proto3.pb.go b/vendor/github.com/gogo/protobuf/proto/proto3_proto/proto3.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/proto3_proto/proto3.pb.go
rename to vendor/github.com/gogo/protobuf/proto/proto3_proto/proto3.pb.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/proto3_proto/proto3.proto b/vendor/github.com/gogo/protobuf/proto/proto3_proto/proto3.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/proto3_proto/proto3.proto
rename to vendor/github.com/gogo/protobuf/proto/proto3_proto/proto3.proto
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/skip_gogo.go b/vendor/github.com/gogo/protobuf/proto/skip_gogo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/skip_gogo.go
rename to vendor/github.com/gogo/protobuf/proto/skip_gogo.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go b/vendor/github.com/gogo/protobuf/proto/text.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go
rename to vendor/github.com/gogo/protobuf/proto/text.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_gogo.go b/vendor/github.com/gogo/protobuf/proto/text_gogo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_gogo.go
rename to vendor/github.com/gogo/protobuf/proto/text_gogo.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go b/vendor/github.com/gogo/protobuf/proto/text_parser.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go
rename to vendor/github.com/gogo/protobuf/proto/text_parser.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/Makefile b/vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/Makefile
rename to vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/Makefile
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/descriptor.pb.go b/vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/descriptor.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/descriptor.pb.go
rename to vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/descriptor.pb.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/gostring.go b/vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/gostring.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/gostring.go
rename to vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/gostring.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/helper.go b/vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/helper.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/helper.go
rename to vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/helper.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/generator/generator.go b/vendor/github.com/gogo/protobuf/protoc-gen-gogo/generator/generator.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/generator/generator.go
rename to vendor/github.com/gogo/protobuf/protoc-gen-gogo/generator/generator.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/generator/helper.go b/vendor/github.com/gogo/protobuf/protoc-gen-gogo/generator/helper.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/generator/helper.go
rename to vendor/github.com/gogo/protobuf/protoc-gen-gogo/generator/helper.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/plugin/Makefile b/vendor/github.com/gogo/protobuf/protoc-gen-gogo/plugin/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/plugin/Makefile
rename to vendor/github.com/gogo/protobuf/protoc-gen-gogo/plugin/Makefile
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/plugin/plugin.pb.go b/vendor/github.com/gogo/protobuf/protoc-gen-gogo/plugin/plugin.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/plugin/plugin.pb.go
rename to vendor/github.com/gogo/protobuf/protoc-gen-gogo/plugin/plugin.pb.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/sortkeys/sortkeys.go b/vendor/github.com/gogo/protobuf/sortkeys/sortkeys.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/sortkeys/sortkeys.go
rename to vendor/github.com/gogo/protobuf/sortkeys/sortkeys.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/command/command.go b/vendor/github.com/gogo/protobuf/vanity/command/command.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/command/command.go
rename to vendor/github.com/gogo/protobuf/vanity/command/command.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/enum.go b/vendor/github.com/gogo/protobuf/vanity/enum.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/enum.go
rename to vendor/github.com/gogo/protobuf/vanity/enum.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/field.go b/vendor/github.com/gogo/protobuf/vanity/field.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/field.go
rename to vendor/github.com/gogo/protobuf/vanity/field.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/file.go b/vendor/github.com/gogo/protobuf/vanity/file.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/file.go
rename to vendor/github.com/gogo/protobuf/vanity/file.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/foreach.go b/vendor/github.com/gogo/protobuf/vanity/foreach.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/foreach.go
rename to vendor/github.com/gogo/protobuf/vanity/foreach.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/msg.go b/vendor/github.com/gogo/protobuf/vanity/msg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/msg.go
rename to vendor/github.com/gogo/protobuf/vanity/msg.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/Makefile b/vendor/github.com/gogo/protobuf/vanity/test/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/Makefile
rename to vendor/github.com/gogo/protobuf/vanity/test/Makefile
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/doc.go b/vendor/github.com/gogo/protobuf/vanity/test/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/doc.go
rename to vendor/github.com/gogo/protobuf/vanity/test/doc.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/fast/gogovanity.pb.go b/vendor/github.com/gogo/protobuf/vanity/test/fast/gogovanity.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/fast/gogovanity.pb.go
rename to vendor/github.com/gogo/protobuf/vanity/test/fast/gogovanity.pb.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/fast/proto3.pb.go b/vendor/github.com/gogo/protobuf/vanity/test/fast/proto3.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/fast/proto3.pb.go
rename to vendor/github.com/gogo/protobuf/vanity/test/fast/proto3.pb.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/fast/vanity.pb.go b/vendor/github.com/gogo/protobuf/vanity/test/fast/vanity.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/fast/vanity.pb.go
rename to vendor/github.com/gogo/protobuf/vanity/test/fast/vanity.pb.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/faster/gogovanity.pb.go b/vendor/github.com/gogo/protobuf/vanity/test/faster/gogovanity.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/faster/gogovanity.pb.go
rename to vendor/github.com/gogo/protobuf/vanity/test/faster/gogovanity.pb.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/faster/proto3.pb.go b/vendor/github.com/gogo/protobuf/vanity/test/faster/proto3.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/faster/proto3.pb.go
rename to vendor/github.com/gogo/protobuf/vanity/test/faster/proto3.pb.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/faster/vanity.pb.go b/vendor/github.com/gogo/protobuf/vanity/test/faster/vanity.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/faster/vanity.pb.go
rename to vendor/github.com/gogo/protobuf/vanity/test/faster/vanity.pb.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/gofast/.gitignore b/vendor/github.com/gogo/protobuf/vanity/test/gofast/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/gofast/.gitignore
rename to vendor/github.com/gogo/protobuf/vanity/test/gofast/.gitignore
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/gogovanity.proto b/vendor/github.com/gogo/protobuf/vanity/test/gogovanity.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/gogovanity.proto
rename to vendor/github.com/gogo/protobuf/vanity/test/gogovanity.proto
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/proto3.proto b/vendor/github.com/gogo/protobuf/vanity/test/proto3.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/proto3.proto
rename to vendor/github.com/gogo/protobuf/vanity/test/proto3.proto
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/slick/gogovanity.pb.go b/vendor/github.com/gogo/protobuf/vanity/test/slick/gogovanity.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/slick/gogovanity.pb.go
rename to vendor/github.com/gogo/protobuf/vanity/test/slick/gogovanity.pb.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/slick/proto3.pb.go b/vendor/github.com/gogo/protobuf/vanity/test/slick/proto3.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/slick/proto3.pb.go
rename to vendor/github.com/gogo/protobuf/vanity/test/slick/proto3.pb.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/slick/vanity.pb.go b/vendor/github.com/gogo/protobuf/vanity/test/slick/vanity.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/slick/vanity.pb.go
rename to vendor/github.com/gogo/protobuf/vanity/test/slick/vanity.pb.go
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/vanity.proto b/vendor/github.com/gogo/protobuf/vanity/test/vanity.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/vanity/test/vanity.proto
rename to vendor/github.com/gogo/protobuf/vanity/test/vanity.proto
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/LICENSE b/vendor/github.com/golang/glog/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/go-ini/ini/LICENSE
rename to vendor/github.com/golang/glog/LICENSE
diff --git a/Godeps/_workspace/src/github.com/golang/glog/README b/vendor/github.com/golang/glog/README
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/glog/README
rename to vendor/github.com/golang/glog/README
diff --git a/Godeps/_workspace/src/github.com/golang/glog/glog.go b/vendor/github.com/golang/glog/glog.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/glog/glog.go
rename to vendor/github.com/golang/glog/glog.go
diff --git a/Godeps/_workspace/src/github.com/golang/glog/glog_file.go b/vendor/github.com/golang/glog/glog_file.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/glog/glog_file.go
rename to vendor/github.com/golang/glog/glog_file.go
diff --git a/Godeps/_workspace/src/github.com/golang/glog/LICENSE b/vendor/github.com/golang/groupcache/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/glog/LICENSE
rename to vendor/github.com/golang/groupcache/LICENSE
diff --git a/Godeps/_workspace/src/github.com/golang/groupcache/lru/lru.go b/vendor/github.com/golang/groupcache/lru/lru.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/groupcache/lru/lru.go
rename to vendor/github.com/golang/groupcache/lru/lru.go
diff --git a/Godeps/_workspace/src/github.com/google/btree/LICENSE b/vendor/github.com/golang/mock/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/btree/LICENSE
rename to vendor/github.com/golang/mock/LICENSE
diff --git a/Godeps/_workspace/src/github.com/golang/mock/gomock/call.go b/vendor/github.com/golang/mock/gomock/call.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/mock/gomock/call.go
rename to vendor/github.com/golang/mock/gomock/call.go
diff --git a/Godeps/_workspace/src/github.com/golang/mock/gomock/callset.go b/vendor/github.com/golang/mock/gomock/callset.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/mock/gomock/callset.go
rename to vendor/github.com/golang/mock/gomock/callset.go
diff --git a/Godeps/_workspace/src/github.com/golang/mock/gomock/controller.go b/vendor/github.com/golang/mock/gomock/controller.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/mock/gomock/controller.go
rename to vendor/github.com/golang/mock/gomock/controller.go
diff --git a/Godeps/_workspace/src/github.com/golang/mock/gomock/matchers.go b/vendor/github.com/golang/mock/gomock/matchers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/mock/gomock/matchers.go
rename to vendor/github.com/golang/mock/gomock/matchers.go
diff --git a/Godeps/_workspace/src/github.com/golang/mock/gomock/mock_matcher/mock_matcher.go b/vendor/github.com/golang/mock/gomock/mock_matcher/mock_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/mock/gomock/mock_matcher/mock_matcher.go
rename to vendor/github.com/golang/mock/gomock/mock_matcher/mock_matcher.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/golang/protobuf/LICENSE b/vendor/github.com/golang/protobuf/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/golang/protobuf/LICENSE
rename to vendor/github.com/golang/protobuf/LICENSE
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/Makefile b/vendor/github.com/golang/protobuf/proto/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/Makefile
rename to vendor/github.com/golang/protobuf/proto/Makefile
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone.go b/vendor/github.com/golang/protobuf/proto/clone.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/clone.go
rename to vendor/github.com/golang/protobuf/proto/clone.go
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/decode.go b/vendor/github.com/golang/protobuf/proto/decode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/decode.go
rename to vendor/github.com/golang/protobuf/proto/decode.go
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/encode.go b/vendor/github.com/golang/protobuf/proto/encode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/encode.go
rename to vendor/github.com/golang/protobuf/proto/encode.go
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal.go b/vendor/github.com/golang/protobuf/proto/equal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/equal.go
rename to vendor/github.com/golang/protobuf/proto/equal.go
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions.go b/vendor/github.com/golang/protobuf/proto/extensions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions.go
rename to vendor/github.com/golang/protobuf/proto/extensions.go
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/lib.go b/vendor/github.com/golang/protobuf/proto/lib.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/lib.go
rename to vendor/github.com/golang/protobuf/proto/lib.go
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set.go b/vendor/github.com/golang/protobuf/proto/message_set.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set.go
rename to vendor/github.com/golang/protobuf/proto/message_set.go
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_reflect.go b/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_reflect.go
rename to vendor/github.com/golang/protobuf/proto/pointer_reflect.go
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_unsafe.go b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_unsafe.go
rename to vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/properties.go b/vendor/github.com/golang/protobuf/proto/properties.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/properties.go
rename to vendor/github.com/golang/protobuf/proto/properties.go
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go b/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go
rename to vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.proto b/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.proto
rename to vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.proto
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text.go b/vendor/github.com/golang/protobuf/proto/text.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/text.go
rename to vendor/github.com/golang/protobuf/proto/text.go
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser.go b/vendor/github.com/golang/protobuf/proto/text_parser.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser.go
rename to vendor/github.com/golang/protobuf/proto/text_parser.go
diff --git a/Godeps/_workspace/src/github.com/google/btree/.travis.yml b/vendor/github.com/google/btree/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/btree/.travis.yml
rename to vendor/github.com/google/btree/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/LICENSE b/vendor/github.com/google/btree/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/gofuzz/LICENSE
rename to vendor/github.com/google/btree/LICENSE
diff --git a/Godeps/_workspace/src/github.com/google/btree/README.md b/vendor/github.com/google/btree/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/btree/README.md
rename to vendor/github.com/google/btree/README.md
diff --git a/Godeps/_workspace/src/github.com/google/btree/btree.go b/vendor/github.com/google/btree/btree.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/btree/btree.go
rename to vendor/github.com/google/btree/btree.go
diff --git a/Godeps/_workspace/src/github.com/google/btree/btree_mem.go b/vendor/github.com/google/btree/btree_mem.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/btree/btree_mem.go
rename to vendor/github.com/google/btree/btree_mem.go
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/SeanDolphin/bqschema/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/SeanDolphin/bqschema/LICENSE
new file mode 100644
index 0000000000..902306b9d2
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/SeanDolphin/bqschema/LICENSE
@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+      Copyright 2015 Sean Dolphin
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/Sirupsen/logrus/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/Sirupsen/logrus/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/abbot/go-http-auth/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/abbot/go-http-auth/LICENSE
new file mode 100644
index 0000000000..e454a52586
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/abbot/go-http-auth/LICENSE
@@ -0,0 +1,178 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/aws/aws-sdk-go/LICENSE.txt b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/aws/aws-sdk-go/LICENSE.txt
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/aws/aws-sdk-go/NOTICE.txt b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/aws/aws-sdk-go/NOTICE.txt
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt
diff --git a/Godeps/_workspace/src/github.com/golang/groupcache/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/coreos/go-systemd/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/groupcache/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/coreos/go-systemd/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/rkt/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/coreos/rkt/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/rkt/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/coreos/rkt/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/denverdino/aliyungo/LICENSE.txt b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/LICENSE
similarity index 99%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/denverdino/aliyungo/LICENSE.txt
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/LICENSE
index 9182971332..c7a3f0cfd4 100644
--- a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/denverdino/aliyungo/LICENSE.txt
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/LICENSE
@@ -176,7 +176,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2015-2015 Li Yi (denverdino@gmail.com).
+   Copyright 2013-2015 Docker, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/NOTICE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/NOTICE
new file mode 100644
index 0000000000..6e6f469ab9
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/NOTICE
@@ -0,0 +1,19 @@
+Docker
+Copyright 2012-2015 Docker, Inc.
+
+This product includes software developed at Docker, Inc. (https://www.docker.com).
+
+This product contains software (https://github.com/kr/pty) developed
+by Keith Rarick, licensed under the MIT License.
+
+The following is courtesy of our legal counsel:
+
+
+Use and transfer of Docker may be subject to certain restrictions by the
+United States and other governments.
+It is your responsibility to ensure that your use and/or transfer does not
+violate applicable laws.
+
+For more information, please see https://www.bis.doc.gov
+
+See also https://www.apache.org/dev/crypto.html and/or seek legal counsel.
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/contrib/docker-engine-selinux/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/contrib/docker-engine-selinux/LICENSE
new file mode 100644
index 0000000000..4362b49151
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/contrib/docker-engine-selinux/LICENSE
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/contrib/syntax/vim/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/contrib/syntax/vim/LICENSE
new file mode 100644
index 0000000000..e67cdabd22
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/contrib/syntax/vim/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2013 Honza Pokorny
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/pkg/mflag/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/pkg/mflag/LICENSE
new file mode 100644
index 0000000000..ac74d8f049
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/pkg/mflag/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014-2015 The Docker & Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.APACHE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/spdystream/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.APACHE
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.BSD b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.BSD
new file mode 100644
index 0000000000..ac74d8f049
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.BSD
@@ -0,0 +1,27 @@
+Copyright (c) 2014-2015 The Docker & Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.code b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.code
new file mode 100644
index 0000000000..b55b37bc31
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.code
@@ -0,0 +1,191 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2015 Docker, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.docs b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.docs
new file mode 100644
index 0000000000..e26cd4fc8e
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.docs
@@ -0,0 +1,425 @@
+Attribution-ShareAlike 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+	wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More_considerations
+     for the public:
+	wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution-ShareAlike 4.0 International Public
+License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution-ShareAlike 4.0 International Public License ("Public
+License"). To the extent this Public License may be interpreted as a
+contract, You are granted the Licensed Rights in consideration of Your
+acceptance of these terms and conditions, and the Licensor grants You
+such rights in consideration of benefits the Licensor receives from
+making the Licensed Material available under these terms and
+conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. BY-SA Compatible License means a license listed at
+     creativecommons.org/compatiblelicenses, approved by Creative
+     Commons as essentially the equivalent of this Public License.
+
+  d. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  e. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  f. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  g. License Elements means the license attributes listed in the name
+     of a Creative Commons Public License. The License Elements of this
+     Public License are Attribution and ShareAlike.
+
+  h. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  i. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  j. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  k. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  l. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  m. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. Additional offer from the Licensor -- Adapted Material.
+               Every recipient of Adapted Material from You
+               automatically receives an offer from the Licensor to
+               exercise the Licensed Rights in the Adapted Material
+               under the conditions of the Adapter's License You apply.
+
+            c. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+  b. ShareAlike.
+
+     In addition to the conditions in Section 3(a), if You Share
+     Adapted Material You produce, the following conditions also apply.
+
+       1. The Adapter's License You apply must be a Creative Commons
+          license with the same License Elements, this version or
+          later, or a BY-SA Compatible License.
+
+       2. You must include the text of, or the URI or hyperlink to, the
+          Adapter's License You apply. You may satisfy this condition
+          in any reasonable manner based on the medium, means, and
+          context in which You Share Adapted Material.
+
+       3. You may not offer or impose any additional or different terms
+          or conditions on, or apply any Effective Technological
+          Measures to, Adapted Material that restrict exercise of the
+          rights granted under the Adapter's License You apply.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material,
+
+     including for purposes of Section 3(b); and
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public licenses.
+Notwithstanding, Creative Commons may elect to apply one of its public
+licenses to material it publishes and in those instances will be
+considered the "Licensor." Except for the limited purpose of indicating
+that material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the public
+licenses.
+
+Creative Commons may be contacted at creativecommons.org.
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/microsoft/hcsshim/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/eapache/go-resiliency/LICENSE
similarity index 97%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/microsoft/hcsshim/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/eapache/go-resiliency/LICENSE
index b8b569d774..698a3f5139 100644
--- a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/microsoft/hcsshim/LICENSE
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/eapache/go-resiliency/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Microsoft
+Copyright (c) 2014 Evan Huus
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Godeps/_workspace/src/github.com/xiang90/probing/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/eapache/queue/LICENSE
similarity index 96%
rename from Godeps/_workspace/src/github.com/xiang90/probing/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/eapache/queue/LICENSE
index cde8b8b05f..d5f36dbcaa 100644
--- a/Godeps/_workspace/src/github.com/xiang90/probing/LICENSE
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/eapache/queue/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Xiang Li
+Copyright (c) 2014 Evan Huus
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,5 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+SOFTWARE.
\ No newline at end of file
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE
new file mode 100644
index 0000000000..b1cdd4cd20
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2016, go-dockerclient authors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/LICENSE
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.code b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.code
new file mode 100644
index 0000000000..b55b37bc31
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.code
@@ -0,0 +1,191 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2015 Docker, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.docs b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.docs
new file mode 100644
index 0000000000..e26cd4fc8e
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.docs
@@ -0,0 +1,425 @@
+Attribution-ShareAlike 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+	wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More_considerations
+     for the public:
+	wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution-ShareAlike 4.0 International Public
+License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution-ShareAlike 4.0 International Public License ("Public
+License"). To the extent this Public License may be interpreted as a
+contract, You are granted the Licensed Rights in consideration of Your
+acceptance of these terms and conditions, and the Licensor grants You
+such rights in consideration of benefits the Licensor receives from
+making the Licensed Material available under these terms and
+conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. BY-SA Compatible License means a license listed at
+     creativecommons.org/compatiblelicenses, approved by Creative
+     Commons as essentially the equivalent of this Public License.
+
+  d. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  e. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  f. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  g. License Elements means the license attributes listed in the name
+     of a Creative Commons Public License. The License Elements of this
+     Public License are Attribution and ShareAlike.
+
+  h. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  i. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  j. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  k. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  l. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  m. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. Additional offer from the Licensor -- Adapted Material.
+               Every recipient of Adapted Material from You
+               automatically receives an offer from the Licensor to
+               exercise the Licensed Rights in the Adapted Material
+               under the conditions of the Adapter's License You apply.
+
+            c. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+  b. ShareAlike.
+
+     In addition to the conditions in Section 3(a), if You Share
+     Adapted Material You produce, the following conditions also apply.
+
+       1. The Adapter's License You apply must be a Creative Commons
+          license with the same License Elements, this version or
+          later, or a BY-SA Compatible License.
+
+       2. You must include the text of, or the URI or hyperlink to, the
+          Adapter's License You apply. You may satisfy this condition
+          in any reasonable manner based on the medium, means, and
+          context in which You Share Adapted Material.
+
+       3. You may not offer or impose any additional or different terms
+          or conditions on, or apply any Effective Technological
+          Measures to, Adapted Material that restrict exercise of the
+          rights granted under the Adapter's License You apply.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material,
+
+     including for purposes of Section 3(b); and
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public licenses.
+Notwithstanding, Creative Commons may elect to apply one of its public
+licenses to material it publishes and in those instances will be
+considered the "Licensor." Except for the limited purpose of indicating
+that material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the public
+licenses.
+
+Creative Commons may be contacted at creativecommons.org.
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/LICENSE
new file mode 100644
index 0000000000..e87a115e46
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/LICENSE
@@ -0,0 +1,363 @@
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. "Contributor"
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+
+     means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the terms of
+        a Secondary License.
+
+1.6. "Executable Form"
+
+     means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+
+     means a work that combines Covered Software with other material, in a
+     separate file or files, that is not Covered Software.
+
+1.8. "License"
+
+     means this document.
+
+1.9. "Licensable"
+
+     means having the right to grant, to the maximum extent possible, whether
+     at the time of the initial grant or subsequently, any and all of the
+     rights conveyed by this License.
+
+1.10. "Modifications"
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. "Patent Claims" of a Contributor
+
+      means any patent claim(s), including without limitation, method,
+      process, and apparatus claims, in any patent Licensable by such
+      Contributor that would be infringed, but for the grant of the License,
+      by the making, using, selling, offering for sale, having made, import,
+      or transfer of either its Contributions or its Contributor Version.
+
+1.12. "Secondary License"
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. "Source Code Form"
+
+      means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, "You" includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, "control" means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or
+        as part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its
+        Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution
+     become effective for each Contribution on the date the Contributor first
+     distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under
+     this License. No additional rights or licenses will be implied from the
+     distribution or licensing of Covered Software under this License.
+     Notwithstanding Section 2.1(b) above, no patent license is granted by a
+     Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party's
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of
+        its Contributions.
+
+     This License does not grant any rights in the trademarks, service marks,
+     or logos of any Contributor (except as may be necessary to comply with
+     the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this
+     License (see Section 10.2) or under the terms of a Secondary License (if
+     permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its
+     Contributions are its original creation(s) or it has sufficient rights to
+     grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under
+     applicable copyright doctrines of fair use, fair dealing, or other
+     equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under
+     the terms of this License. You must inform recipients that the Source
+     Code Form of the Covered Software is governed by the terms of this
+     License, and how they can obtain a copy of this License. You may not
+     attempt to alter or restrict the recipients' rights in the Source Code
+     Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this
+        License, or sublicense it under different terms, provided that the
+        license for the Executable Form does not attempt to limit or alter the
+        recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for
+     the Covered Software. If the Larger Work is a combination of Covered
+     Software with a work governed by one or more Secondary Licenses, and the
+     Covered Software is not Incompatible With Secondary Licenses, this
+     License permits You to additionally distribute such Covered Software
+     under the terms of such Secondary License(s), so that the recipient of
+     the Larger Work may, at their option, further distribute the Covered
+     Software under the terms of either this License or such Secondary
+     License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices
+     (including copyright notices, patent notices, disclaimers of warranty, or
+     limitations of liability) contained within the Source Code Form of the
+     Covered Software, except that You may alter any license notices to the
+     extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on
+     behalf of any Contributor. You must make it absolutely clear that any
+     such warranty, support, indemnity, or liability obligation is offered by
+     You alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute,
+   judicial order, or regulation then You must: (a) comply with the terms of
+   this License to the maximum extent possible; and (b) describe the
+   limitations and the code they affect. Such description must be placed in a
+   text file included with all distributions of the Covered Software under
+   this License. Except to the extent prohibited by statute or regulation,
+   such description must be sufficiently detailed for a recipient of ordinary
+   skill to be able to understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing
+     basis, if such Contributor fails to notify You of the non-compliance by
+     some reasonable means prior to 60 days after You have come back into
+     compliance. Moreover, Your grants from a particular Contributor are
+     reinstated on an ongoing basis if such Contributor notifies You of the
+     non-compliance by some reasonable means, this is the first time You have
+     received notice of non-compliance with this License from such
+     Contributor, and You become compliant prior to 30 days after Your receipt
+     of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions,
+     counter-claims, and cross-claims) alleging that a Contributor Version
+     directly or indirectly infringes any patent, then the rights granted to
+     You by any and all Contributors for the Covered Software under Section
+     2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an "as is" basis,
+   without warranty of any kind, either expressed, implied, or statutory,
+   including, without limitation, warranties that the Covered Software is free
+   of defects, merchantable, fit for a particular purpose or non-infringing.
+   The entire risk as to the quality and performance of the Covered Software
+   is with You. Should any Covered Software prove defective in any respect,
+   You (not any Contributor) assume the cost of any necessary servicing,
+   repair, or correction. This disclaimer of warranty constitutes an essential
+   part of this License. No use of  any Covered Software is authorized under
+   this License except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from
+   such party's negligence to the extent applicable law prohibits such
+   limitation. Some jurisdictions do not allow the exclusion or limitation of
+   incidental or consequential damages, so this exclusion and limitation may
+   not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts
+   of a jurisdiction where the defendant maintains its principal place of
+   business and such litigation shall be governed by laws of that
+   jurisdiction, without reference to its conflict-of-law provisions. Nothing
+   in this Section shall prevent a party's ability to bring cross-claims or
+   counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject
+   matter hereof. If any provision of this License is held to be
+   unenforceable, such provision shall be reformed only to the extent
+   necessary to make it enforceable. Any law or regulation which provides that
+   the language of a contract shall be construed against the drafter shall not
+   be used to construe this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version
+      of the License under which You originally received the Covered Software,
+      or under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a
+      modified version of this License if you rename the license and remove
+      any references to the name of the license steward (except to note that
+      such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+      Licenses If You choose to distribute Source Code Form that is
+      Incompatible With Secondary Licenses under the terms of this version of
+      the License, the notice described in Exhibit B of this License must be
+      attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file,
+then You may include the notice in a location (such as a LICENSE file in a
+relevant directory) where a recipient would be likely to look for such a
+notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+
+      This Source Code Form is "Incompatible
+      With Secondary Licenses", as defined by
+      the Mozilla Public License, v. 2.0.
+
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/go-ini/ini/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/go-ini/ini/LICENSE
new file mode 100644
index 0000000000..37ec93a14f
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/go-ini/ini/LICENSE
@@ -0,0 +1,191 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/godbus/dbus/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/godbus/dbus/LICENSE
new file mode 100644
index 0000000000..670d88fcaa
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/godbus/dbus/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2013, Georg Reinke (<guelfey at gmail dot com>), Google
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/golang/glog/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/golang/glog/LICENSE
new file mode 100644
index 0000000000..37ec93a14f
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/golang/glog/LICENSE
@@ -0,0 +1,191 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/protobuf/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/golang/snappy/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/golang/snappy/LICENSE
new file mode 100644
index 0000000000..6050c10f4c
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/golang/snappy/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2011 The Snappy-Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE_OF_DEPENDENCIES.md b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE_OF_DEPENDENCIES.md
new file mode 100644
index 0000000000..7aae45f9db
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE_OF_DEPENDENCIES.md
@@ -0,0 +1,19 @@
+# List
+- github.com/gogo/protobuf/proto [BSD LICENSE](https://github.com/gogo/protobuf/blob/master/LICENSE)
+- gopkg.in/fatih/pool.v2 [MIT LICENSE](https://github.com/fatih/pool/blob/v2.0.0/LICENSE)
+- github.com/BurntSushi/toml [WTFPL LICENSE](https://github.com/BurntSushi/toml/blob/master/COPYING)
+- github.com/peterh/liner [MIT LICENSE](https://github.com/peterh/liner/blob/master/COPYING)
+- github.com/davecgh/go-spew/spew [ISC LICENSE](https://github.com/davecgh/go-spew/blob/master/LICENSE)
+- github.com/hashicorp/raft [MPL LICENSE](https://github.com/hashicorp/raft/blob/master/LICENSE)
+- github.com/rakyll/statik/fs [APACHE LICENSE](https://github.com/rakyll/statik/blob/master/LICENSE)
+- github.com/kimor79/gollectd [BSD LICENSE](https://github.com/kimor79/gollectd/blob/master/LICENSE)
+- github.com/bmizerany/pat [MIT LICENSE](https://github.com/bmizerany/pat#license)
+- react 0.13.3 [BSD LICENSE](https://github.com/facebook/react/blob/master/LICENSE)
+- bootstrap 3.3.5 [MIT LICENSE](https://github.com/twbs/bootstrap/blob/master/LICENSE)
+- jquery 2.1.4 [MIT LICENSE](https://github.com/jquery/jquery/blob/master/LICENSE.txt)
+- glyphicons [LICENSE](http://glyphicons.com/license/)
+- github.com/golang/snappy [BSD LICENSE](https://github.com/golang/snappy/blob/master/LICENSE)
+- github.com/boltdb/bolt [MIT LICENSE](https://github.com/boltdb/bolt/blob/master/LICENSE)
+- collectd.org [ISC LICENSE](https://github.com/collectd/go-collectd/blob/master/LICENSE)
+- golang.org/x/crypto/* [BSD LICENSE](https://github.com/golang/crypto/blob/master/LICENSE)
+
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/vendor/github.com/jmespath/go-jmespath/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/vendor/github.com/jmespath/go-jmespath/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/klauspost/crc32/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/klauspost/crc32/LICENSE
new file mode 100644
index 0000000000..4fd5963e39
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/klauspost/crc32/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2012 The Go Authors. All rights reserved.
+Copyright (c) 2015 Klaus Post
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/ncw/swift/COPYING b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/kr/pretty/License
similarity index 93%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/ncw/swift/COPYING
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/kr/pretty/License
index 8c27c67fd0..05c783ccf6 100644
--- a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/ncw/swift/COPYING
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/kr/pretty/License
@@ -1,4 +1,6 @@
-Copyright (C) 2012 by Nick Craig-Wood http://www.craig-wood.com/nick/
+The MIT License (MIT)
+
+Copyright 2012 Keith Rarick
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -17,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/olekukonko/tablewriter/LICENCE.md b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/kr/text/License
similarity index 95%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/olekukonko/tablewriter/LICENCE.md
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/kr/text/License
index 1fd8484253..480a328059 100644
--- a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/olekukonko/tablewriter/LICENCE.md
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/kr/text/License
@@ -1,4 +1,4 @@
-Copyright (C) 2014 by Oleku Konko
+Copyright 2012 Keith Rarick
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/matttproud/golang_protobuf_extensions/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/matttproud/golang_protobuf_extensions/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/mistifyio/go-zfs/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/mistifyio/go-zfs/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/mistifyio/go-zfs/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/mistifyio/go-zfs/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/docker/libtrust/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/opencontainers/runc/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/docker/libtrust/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/opencontainers/runc/LICENSE
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/NOTICE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/opencontainers/runc/NOTICE
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/NOTICE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/opencontainers/runc/NOTICE
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE
new file mode 100644
index 0000000000..5dc68268d9
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009,2014 Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/client_model/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/prometheus/client_golang/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/client_model/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/prometheus/client_golang/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/client_golang/NOTICE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/prometheus/client_golang/NOTICE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/client_golang/NOTICE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/prometheus/client_golang/NOTICE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/common/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/prometheus/client_model/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/common/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/prometheus/client_model/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/client_model/NOTICE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/prometheus/client_model/NOTICE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/client_model/NOTICE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/prometheus/client_model/NOTICE
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_model/ruby/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/prometheus/client_model/ruby/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_model/ruby/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/prometheus/client_model/ruby/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/procfs/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/prometheus/procfs/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/procfs/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/prometheus/procfs/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/procfs/NOTICE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/prometheus/procfs/NOTICE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/prometheus/procfs/NOTICE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/prometheus/procfs/NOTICE
diff --git a/Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/LICENSE
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md
new file mode 100644
index 0000000000..2199945813
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md
@@ -0,0 +1,23 @@
+objx - by Mat Ryer and Tyler Bunnell
+
+The MIT License (MIT)
+
+Copyright (c) 2014 Stretchr, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE
new file mode 100644
index 0000000000..80dd96de77
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE
@@ -0,0 +1,24 @@
+Copyright 2013 Suryandaru Triandana <syndtr@gmail.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE
diff --git a/Godeps/_workspace/src/golang.org/x/net/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/golang.org/x/exp/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/golang.org/x/exp/LICENSE
diff --git a/Godeps/_workspace/src/golang.org/x/net/PATENTS b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/golang.org/x/exp/PATENTS
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/PATENTS
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/golang.org/x/exp/PATENTS
diff --git a/Godeps/_workspace/src/golang.org/x/sys/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/golang.org/x/net/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/golang.org/x/net/LICENSE
diff --git a/Godeps/_workspace/src/golang.org/x/sys/PATENTS b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/golang.org/x/net/PATENTS
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/PATENTS
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/golang.org/x/net/PATENTS
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/golang.org/x/oauth2/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/golang.org/x/oauth2/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/golang.org/x/oauth2/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/golang.org/x/oauth2/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/google.golang.org/api/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/google.golang.org/api/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/google.golang.org/api/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/google.golang.org/api/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/google.golang.org/api/googleapi/internal/uritemplates/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/google.golang.org/api/googleapi/internal/uritemplates/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/google.golang.org/cloud/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/google.golang.org/cloud/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/google.golang.org/cloud/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/google.golang.org/cloud/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/google.golang.org/grpc/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/google.golang.org/grpc/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/google.golang.org/grpc/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/google.golang.org/grpc/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/google.golang.org/grpc/PATENTS b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/google.golang.org/grpc/PATENTS
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/google.golang.org/grpc/PATENTS
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/google.golang.org/grpc/PATENTS
diff --git a/vendor/github.com/google/cadvisor/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/LICENSE
new file mode 100644
index 0000000000..8b22cdb601
--- /dev/null
+++ b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+Copyright © 2012-2015 Oliver Eilhard
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the “Software”), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE b/vendor/github.com/google/cadvisor/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/uritemplates/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE
rename to vendor/github.com/google/cadvisor/Godeps/_workspace/src/gopkg.in/olivere/elastic.v2/uritemplates/LICENSE
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/LICENSE b/vendor/github.com/google/cadvisor/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/LICENSE
rename to vendor/github.com/google/cadvisor/LICENSE
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/api/handler.go b/vendor/github.com/google/cadvisor/api/handler.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/api/handler.go
rename to vendor/github.com/google/cadvisor/api/handler.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/api/versions.go b/vendor/github.com/google/cadvisor/api/versions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/api/versions.go
rename to vendor/github.com/google/cadvisor/api/versions.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/cache/memory/memory.go b/vendor/github.com/google/cadvisor/cache/memory/memory.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/cache/memory/memory.go
rename to vendor/github.com/google/cadvisor/cache/memory/memory.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/collector/collector_manager.go b/vendor/github.com/google/cadvisor/collector/collector_manager.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/collector/collector_manager.go
rename to vendor/github.com/google/cadvisor/collector/collector_manager.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/collector/config.go b/vendor/github.com/google/cadvisor/collector/config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/collector/config.go
rename to vendor/github.com/google/cadvisor/collector/config.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/collector/config/sample_config.json b/vendor/github.com/google/cadvisor/collector/config/sample_config.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/collector/config/sample_config.json
rename to vendor/github.com/google/cadvisor/collector/config/sample_config.json
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/collector/config/sample_config_prometheus.json b/vendor/github.com/google/cadvisor/collector/config/sample_config_prometheus.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/collector/config/sample_config_prometheus.json
rename to vendor/github.com/google/cadvisor/collector/config/sample_config_prometheus.json
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/collector/config/sample_config_prometheus_filtered.json b/vendor/github.com/google/cadvisor/collector/config/sample_config_prometheus_filtered.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/collector/config/sample_config_prometheus_filtered.json
rename to vendor/github.com/google/cadvisor/collector/config/sample_config_prometheus_filtered.json
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/collector/fakes.go b/vendor/github.com/google/cadvisor/collector/fakes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/collector/fakes.go
rename to vendor/github.com/google/cadvisor/collector/fakes.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/collector/generic_collector.go b/vendor/github.com/google/cadvisor/collector/generic_collector.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/collector/generic_collector.go
rename to vendor/github.com/google/cadvisor/collector/generic_collector.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/collector/prometheus_collector.go b/vendor/github.com/google/cadvisor/collector/prometheus_collector.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/collector/prometheus_collector.go
rename to vendor/github.com/google/cadvisor/collector/prometheus_collector.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/collector/types.go b/vendor/github.com/google/cadvisor/collector/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/collector/types.go
rename to vendor/github.com/google/cadvisor/collector/types.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/common/container_hints.go b/vendor/github.com/google/cadvisor/container/common/container_hints.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/common/container_hints.go
rename to vendor/github.com/google/cadvisor/container/common/container_hints.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/common/fsHandler.go b/vendor/github.com/google/cadvisor/container/common/fsHandler.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/common/fsHandler.go
rename to vendor/github.com/google/cadvisor/container/common/fsHandler.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/common/helpers.go b/vendor/github.com/google/cadvisor/container/common/helpers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/common/helpers.go
rename to vendor/github.com/google/cadvisor/container/common/helpers.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/common/inotify_watcher.go b/vendor/github.com/google/cadvisor/container/common/inotify_watcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/common/inotify_watcher.go
rename to vendor/github.com/google/cadvisor/container/common/inotify_watcher.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/common/test_resources/container_hints.json b/vendor/github.com/google/cadvisor/container/common/test_resources/container_hints.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/common/test_resources/container_hints.json
rename to vendor/github.com/google/cadvisor/container/common/test_resources/container_hints.json
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/container.go b/vendor/github.com/google/cadvisor/container/container.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/container.go
rename to vendor/github.com/google/cadvisor/container/container.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/docker/client.go b/vendor/github.com/google/cadvisor/container/docker/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/docker/client.go
rename to vendor/github.com/google/cadvisor/container/docker/client.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/docker/factory.go b/vendor/github.com/google/cadvisor/container/docker/factory.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/docker/factory.go
rename to vendor/github.com/google/cadvisor/container/docker/factory.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/docker/handler.go b/vendor/github.com/google/cadvisor/container/docker/handler.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/docker/handler.go
rename to vendor/github.com/google/cadvisor/container/docker/handler.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/factory.go b/vendor/github.com/google/cadvisor/container/factory.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/factory.go
rename to vendor/github.com/google/cadvisor/container/factory.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/libcontainer/helpers.go b/vendor/github.com/google/cadvisor/container/libcontainer/helpers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/libcontainer/helpers.go
rename to vendor/github.com/google/cadvisor/container/libcontainer/helpers.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/mock.go b/vendor/github.com/google/cadvisor/container/mock.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/mock.go
rename to vendor/github.com/google/cadvisor/container/mock.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/raw/factory.go b/vendor/github.com/google/cadvisor/container/raw/factory.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/raw/factory.go
rename to vendor/github.com/google/cadvisor/container/raw/factory.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/raw/handler.go b/vendor/github.com/google/cadvisor/container/raw/handler.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/raw/handler.go
rename to vendor/github.com/google/cadvisor/container/raw/handler.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/rkt/client.go b/vendor/github.com/google/cadvisor/container/rkt/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/rkt/client.go
rename to vendor/github.com/google/cadvisor/container/rkt/client.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/rkt/factory.go b/vendor/github.com/google/cadvisor/container/rkt/factory.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/rkt/factory.go
rename to vendor/github.com/google/cadvisor/container/rkt/factory.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/rkt/handler.go b/vendor/github.com/google/cadvisor/container/rkt/handler.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/rkt/handler.go
rename to vendor/github.com/google/cadvisor/container/rkt/handler.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/rkt/helpers.go b/vendor/github.com/google/cadvisor/container/rkt/helpers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/rkt/helpers.go
rename to vendor/github.com/google/cadvisor/container/rkt/helpers.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/container/systemd/factory.go b/vendor/github.com/google/cadvisor/container/systemd/factory.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/container/systemd/factory.go
rename to vendor/github.com/google/cadvisor/container/systemd/factory.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/events/handler.go b/vendor/github.com/google/cadvisor/events/handler.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/events/handler.go
rename to vendor/github.com/google/cadvisor/events/handler.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/fs/fs.go b/vendor/github.com/google/cadvisor/fs/fs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/fs/fs.go
rename to vendor/github.com/google/cadvisor/fs/fs.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/fs/test_resources/diskstats b/vendor/github.com/google/cadvisor/fs/test_resources/diskstats
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/fs/test_resources/diskstats
rename to vendor/github.com/google/cadvisor/fs/test_resources/diskstats
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/fs/types.go b/vendor/github.com/google/cadvisor/fs/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/fs/types.go
rename to vendor/github.com/google/cadvisor/fs/types.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/healthz/healthz.go b/vendor/github.com/google/cadvisor/healthz/healthz.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/healthz/healthz.go
rename to vendor/github.com/google/cadvisor/healthz/healthz.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/http/handlers.go b/vendor/github.com/google/cadvisor/http/handlers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/http/handlers.go
rename to vendor/github.com/google/cadvisor/http/handlers.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/http/mux/mux.go b/vendor/github.com/google/cadvisor/http/mux/mux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/http/mux/mux.go
rename to vendor/github.com/google/cadvisor/http/mux/mux.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/v1/container.go b/vendor/github.com/google/cadvisor/info/v1/container.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/info/v1/container.go
rename to vendor/github.com/google/cadvisor/info/v1/container.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/v1/machine.go b/vendor/github.com/google/cadvisor/info/v1/machine.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/info/v1/machine.go
rename to vendor/github.com/google/cadvisor/info/v1/machine.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/v1/metric.go b/vendor/github.com/google/cadvisor/info/v1/metric.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/info/v1/metric.go
rename to vendor/github.com/google/cadvisor/info/v1/metric.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/v1/test/datagen.go b/vendor/github.com/google/cadvisor/info/v1/test/datagen.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/info/v1/test/datagen.go
rename to vendor/github.com/google/cadvisor/info/v1/test/datagen.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/v2/container.go b/vendor/github.com/google/cadvisor/info/v2/container.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/info/v2/container.go
rename to vendor/github.com/google/cadvisor/info/v2/container.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/v2/conversion.go b/vendor/github.com/google/cadvisor/info/v2/conversion.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/info/v2/conversion.go
rename to vendor/github.com/google/cadvisor/info/v2/conversion.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/info/v2/machine.go b/vendor/github.com/google/cadvisor/info/v2/machine.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/info/v2/machine.go
rename to vendor/github.com/google/cadvisor/info/v2/machine.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/manager/container.go b/vendor/github.com/google/cadvisor/manager/container.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/manager/container.go
rename to vendor/github.com/google/cadvisor/manager/container.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/manager/machine.go b/vendor/github.com/google/cadvisor/manager/machine.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/manager/machine.go
rename to vendor/github.com/google/cadvisor/manager/machine.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/manager/manager.go b/vendor/github.com/google/cadvisor/manager/manager.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/manager/manager.go
rename to vendor/github.com/google/cadvisor/manager/manager.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/manager/manager_mock.go b/vendor/github.com/google/cadvisor/manager/manager_mock.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/manager/manager_mock.go
rename to vendor/github.com/google/cadvisor/manager/manager_mock.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/metrics/prometheus.go b/vendor/github.com/google/cadvisor/metrics/prometheus.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/metrics/prometheus.go
rename to vendor/github.com/google/cadvisor/metrics/prometheus.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/pages/containers.go b/vendor/github.com/google/cadvisor/pages/containers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/pages/containers.go
rename to vendor/github.com/google/cadvisor/pages/containers.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/pages/containers_html.go b/vendor/github.com/google/cadvisor/pages/containers_html.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/pages/containers_html.go
rename to vendor/github.com/google/cadvisor/pages/containers_html.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/pages/docker.go b/vendor/github.com/google/cadvisor/pages/docker.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/pages/docker.go
rename to vendor/github.com/google/cadvisor/pages/docker.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/pages/pages.go b/vendor/github.com/google/cadvisor/pages/pages.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/pages/pages.go
rename to vendor/github.com/google/cadvisor/pages/pages.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/pages/static/bootstrap_min_css.go b/vendor/github.com/google/cadvisor/pages/static/bootstrap_min_css.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/pages/static/bootstrap_min_css.go
rename to vendor/github.com/google/cadvisor/pages/static/bootstrap_min_css.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/pages/static/bootstrap_min_js.go b/vendor/github.com/google/cadvisor/pages/static/bootstrap_min_js.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/pages/static/bootstrap_min_js.go
rename to vendor/github.com/google/cadvisor/pages/static/bootstrap_min_js.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/pages/static/bootstrap_theme_min_css.go b/vendor/github.com/google/cadvisor/pages/static/bootstrap_theme_min_css.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/pages/static/bootstrap_theme_min_css.go
rename to vendor/github.com/google/cadvisor/pages/static/bootstrap_theme_min_css.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/pages/static/containers_css.go b/vendor/github.com/google/cadvisor/pages/static/containers_css.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/pages/static/containers_css.go
rename to vendor/github.com/google/cadvisor/pages/static/containers_css.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/pages/static/containers_js.go b/vendor/github.com/google/cadvisor/pages/static/containers_js.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/pages/static/containers_js.go
rename to vendor/github.com/google/cadvisor/pages/static/containers_js.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/pages/static/gcharts_js.go b/vendor/github.com/google/cadvisor/pages/static/gcharts_js.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/pages/static/gcharts_js.go
rename to vendor/github.com/google/cadvisor/pages/static/gcharts_js.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/pages/static/google_jsapi_js.go b/vendor/github.com/google/cadvisor/pages/static/google_jsapi_js.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/pages/static/google_jsapi_js.go
rename to vendor/github.com/google/cadvisor/pages/static/google_jsapi_js.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/pages/static/jquery_min_js.go b/vendor/github.com/google/cadvisor/pages/static/jquery_min_js.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/pages/static/jquery_min_js.go
rename to vendor/github.com/google/cadvisor/pages/static/jquery_min_js.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/pages/static/static.go b/vendor/github.com/google/cadvisor/pages/static/static.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/pages/static/static.go
rename to vendor/github.com/google/cadvisor/pages/static/static.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/storage/bigquery/README.md b/vendor/github.com/google/cadvisor/storage/bigquery/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/storage/bigquery/README.md
rename to vendor/github.com/google/cadvisor/storage/bigquery/README.md
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/storage/bigquery/bigquery.go b/vendor/github.com/google/cadvisor/storage/bigquery/bigquery.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/storage/bigquery/bigquery.go
rename to vendor/github.com/google/cadvisor/storage/bigquery/bigquery.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/storage/bigquery/client/client.go b/vendor/github.com/google/cadvisor/storage/bigquery/client/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/storage/bigquery/client/client.go
rename to vendor/github.com/google/cadvisor/storage/bigquery/client/client.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/storage/bigquery/client/example/example.go b/vendor/github.com/google/cadvisor/storage/bigquery/client/example/example.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/storage/bigquery/client/example/example.go
rename to vendor/github.com/google/cadvisor/storage/bigquery/client/example/example.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/storage/common_flags.go b/vendor/github.com/google/cadvisor/storage/common_flags.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/storage/common_flags.go
rename to vendor/github.com/google/cadvisor/storage/common_flags.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/storage/elasticsearch/elasticsearch.go b/vendor/github.com/google/cadvisor/storage/elasticsearch/elasticsearch.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/storage/elasticsearch/elasticsearch.go
rename to vendor/github.com/google/cadvisor/storage/elasticsearch/elasticsearch.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/storage/influxdb/influxdb.go b/vendor/github.com/google/cadvisor/storage/influxdb/influxdb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/storage/influxdb/influxdb.go
rename to vendor/github.com/google/cadvisor/storage/influxdb/influxdb.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/storage/kafka/kafka.go b/vendor/github.com/google/cadvisor/storage/kafka/kafka.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/storage/kafka/kafka.go
rename to vendor/github.com/google/cadvisor/storage/kafka/kafka.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/storage/redis/redis.go b/vendor/github.com/google/cadvisor/storage/redis/redis.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/storage/redis/redis.go
rename to vendor/github.com/google/cadvisor/storage/redis/redis.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/storage/statsd/client/client.go b/vendor/github.com/google/cadvisor/storage/statsd/client/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/storage/statsd/client/client.go
rename to vendor/github.com/google/cadvisor/storage/statsd/client/client.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/storage/statsd/statsd.go b/vendor/github.com/google/cadvisor/storage/statsd/statsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/storage/statsd/statsd.go
rename to vendor/github.com/google/cadvisor/storage/statsd/statsd.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/storage/stdout/stdout.go b/vendor/github.com/google/cadvisor/storage/stdout/stdout.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/storage/stdout/stdout.go
rename to vendor/github.com/google/cadvisor/storage/stdout/stdout.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/storage/storage.go b/vendor/github.com/google/cadvisor/storage/storage.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/storage/storage.go
rename to vendor/github.com/google/cadvisor/storage/storage.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/storage/test/mock.go b/vendor/github.com/google/cadvisor/storage/test/mock.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/storage/test/mock.go
rename to vendor/github.com/google/cadvisor/storage/test/mock.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/storage/test/storagetests.go b/vendor/github.com/google/cadvisor/storage/test/storagetests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/storage/test/storagetests.go
rename to vendor/github.com/google/cadvisor/storage/test/storagetests.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/summary/buffer.go b/vendor/github.com/google/cadvisor/summary/buffer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/summary/buffer.go
rename to vendor/github.com/google/cadvisor/summary/buffer.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/summary/percentiles.go b/vendor/github.com/google/cadvisor/summary/percentiles.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/summary/percentiles.go
rename to vendor/github.com/google/cadvisor/summary/percentiles.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/summary/summary.go b/vendor/github.com/google/cadvisor/summary/summary.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/summary/summary.go
rename to vendor/github.com/google/cadvisor/summary/summary.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/cloudinfo/aws.go b/vendor/github.com/google/cadvisor/utils/cloudinfo/aws.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/cloudinfo/aws.go
rename to vendor/github.com/google/cadvisor/utils/cloudinfo/aws.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/cloudinfo/azure.go b/vendor/github.com/google/cadvisor/utils/cloudinfo/azure.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/cloudinfo/azure.go
rename to vendor/github.com/google/cadvisor/utils/cloudinfo/azure.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/cloudinfo/cloudinfo.go b/vendor/github.com/google/cadvisor/utils/cloudinfo/cloudinfo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/cloudinfo/cloudinfo.go
rename to vendor/github.com/google/cadvisor/utils/cloudinfo/cloudinfo.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/cloudinfo/gce.go b/vendor/github.com/google/cadvisor/utils/cloudinfo/gce.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/cloudinfo/gce.go
rename to vendor/github.com/google/cadvisor/utils/cloudinfo/gce.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/container/container.go b/vendor/github.com/google/cadvisor/utils/container/container.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/container/container.go
rename to vendor/github.com/google/cadvisor/utils/container/container.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/cpuload/cpuload.go b/vendor/github.com/google/cadvisor/utils/cpuload/cpuload.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/cpuload/cpuload.go
rename to vendor/github.com/google/cadvisor/utils/cpuload/cpuload.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/cpuload/netlink/conn.go b/vendor/github.com/google/cadvisor/utils/cpuload/netlink/conn.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/cpuload/netlink/conn.go
rename to vendor/github.com/google/cadvisor/utils/cpuload/netlink/conn.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/cpuload/netlink/defs.go b/vendor/github.com/google/cadvisor/utils/cpuload/netlink/defs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/cpuload/netlink/defs.go
rename to vendor/github.com/google/cadvisor/utils/cpuload/netlink/defs.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/cpuload/netlink/example/example.go b/vendor/github.com/google/cadvisor/utils/cpuload/netlink/example/example.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/cpuload/netlink/example/example.go
rename to vendor/github.com/google/cadvisor/utils/cpuload/netlink/example/example.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/cpuload/netlink/netlink.go b/vendor/github.com/google/cadvisor/utils/cpuload/netlink/netlink.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/cpuload/netlink/netlink.go
rename to vendor/github.com/google/cadvisor/utils/cpuload/netlink/netlink.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/cpuload/netlink/reader.go b/vendor/github.com/google/cadvisor/utils/cpuload/netlink/reader.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/cpuload/netlink/reader.go
rename to vendor/github.com/google/cadvisor/utils/cpuload/netlink/reader.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/machine/machine.go b/vendor/github.com/google/cadvisor/utils/machine/machine.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/machine/machine.go
rename to vendor/github.com/google/cadvisor/utils/machine/machine.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/oomparser/containerOomExampleLog.txt b/vendor/github.com/google/cadvisor/utils/oomparser/containerOomExampleLog.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/oomparser/containerOomExampleLog.txt
rename to vendor/github.com/google/cadvisor/utils/oomparser/containerOomExampleLog.txt
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/oomparser/oomexample/main.go b/vendor/github.com/google/cadvisor/utils/oomparser/oomexample/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/oomparser/oomexample/main.go
rename to vendor/github.com/google/cadvisor/utils/oomparser/oomexample/main.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/oomparser/oomparser.go b/vendor/github.com/google/cadvisor/utils/oomparser/oomparser.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/oomparser/oomparser.go
rename to vendor/github.com/google/cadvisor/utils/oomparser/oomparser.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/oomparser/systemOomExampleLog.txt b/vendor/github.com/google/cadvisor/utils/oomparser/systemOomExampleLog.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/oomparser/systemOomExampleLog.txt
rename to vendor/github.com/google/cadvisor/utils/oomparser/systemOomExampleLog.txt
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/path.go b/vendor/github.com/google/cadvisor/utils/path.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/path.go
rename to vendor/github.com/google/cadvisor/utils/path.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/procfs/doc.go b/vendor/github.com/google/cadvisor/utils/procfs/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/procfs/doc.go
rename to vendor/github.com/google/cadvisor/utils/procfs/doc.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/procfs/jiffy.go b/vendor/github.com/google/cadvisor/utils/procfs/jiffy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/procfs/jiffy.go
rename to vendor/github.com/google/cadvisor/utils/procfs/jiffy.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/sysfs/fakesysfs/fake.go b/vendor/github.com/google/cadvisor/utils/sysfs/fakesysfs/fake.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/sysfs/fakesysfs/fake.go
rename to vendor/github.com/google/cadvisor/utils/sysfs/fakesysfs/fake.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/sysfs/sysfs.go b/vendor/github.com/google/cadvisor/utils/sysfs/sysfs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/sysfs/sysfs.go
rename to vendor/github.com/google/cadvisor/utils/sysfs/sysfs.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/sysinfo/sysinfo.go b/vendor/github.com/google/cadvisor/utils/sysinfo/sysinfo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/sysinfo/sysinfo.go
rename to vendor/github.com/google/cadvisor/utils/sysinfo/sysinfo.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/timed_store.go b/vendor/github.com/google/cadvisor/utils/timed_store.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/timed_store.go
rename to vendor/github.com/google/cadvisor/utils/timed_store.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/utils/utils.go b/vendor/github.com/google/cadvisor/utils/utils.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/utils/utils.go
rename to vendor/github.com/google/cadvisor/utils/utils.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/validate/validate.go b/vendor/github.com/google/cadvisor/validate/validate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/validate/validate.go
rename to vendor/github.com/google/cadvisor/validate/validate.go
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/version/VERSION b/vendor/github.com/google/cadvisor/version/VERSION
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/version/VERSION
rename to vendor/github.com/google/cadvisor/version/VERSION
diff --git a/Godeps/_workspace/src/github.com/google/cadvisor/version/version.go b/vendor/github.com/google/cadvisor/version/version.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/cadvisor/version/version.go
rename to vendor/github.com/google/cadvisor/version/version.go
diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/.travis.yml b/vendor/github.com/google/gofuzz/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/gofuzz/.travis.yml
rename to vendor/github.com/google/gofuzz/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/CONTRIBUTING.md b/vendor/github.com/google/gofuzz/CONTRIBUTING.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/gofuzz/CONTRIBUTING.md
rename to vendor/github.com/google/gofuzz/CONTRIBUTING.md
diff --git a/vendor/github.com/google/gofuzz/LICENSE b/vendor/github.com/google/gofuzz/LICENSE
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/vendor/github.com/google/gofuzz/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/README.md b/vendor/github.com/google/gofuzz/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/gofuzz/README.md
rename to vendor/github.com/google/gofuzz/README.md
diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/doc.go b/vendor/github.com/google/gofuzz/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/gofuzz/doc.go
rename to vendor/github.com/google/gofuzz/doc.go
diff --git a/Godeps/_workspace/src/github.com/google/gofuzz/fuzz.go b/vendor/github.com/google/gofuzz/fuzz.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/google/gofuzz/fuzz.go
rename to vendor/github.com/google/gofuzz/fuzz.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/.travis.yml b/vendor/github.com/gorilla/context/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/context/.travis.yml
rename to vendor/github.com/gorilla/context/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/LICENSE b/vendor/github.com/gorilla/context/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/LICENSE
rename to vendor/github.com/gorilla/context/LICENSE
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/README.md b/vendor/github.com/gorilla/context/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/context/README.md
rename to vendor/github.com/gorilla/context/README.md
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/context.go b/vendor/github.com/gorilla/context/context.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/context/context.go
rename to vendor/github.com/gorilla/context/context.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/doc.go b/vendor/github.com/gorilla/context/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/context/doc.go
rename to vendor/github.com/gorilla/context/doc.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/.travis.yml b/vendor/github.com/gorilla/mux/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/.travis.yml
rename to vendor/github.com/gorilla/mux/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/LICENSE b/vendor/github.com/gorilla/mux/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/LICENSE
rename to vendor/github.com/gorilla/mux/LICENSE
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/README.md b/vendor/github.com/gorilla/mux/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/README.md
rename to vendor/github.com/gorilla/mux/README.md
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/doc.go b/vendor/github.com/gorilla/mux/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/doc.go
rename to vendor/github.com/gorilla/mux/doc.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/mux.go b/vendor/github.com/gorilla/mux/mux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/mux.go
rename to vendor/github.com/gorilla/mux/mux.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/regexp.go b/vendor/github.com/gorilla/mux/regexp.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/regexp.go
rename to vendor/github.com/gorilla/mux/regexp.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/route.go b/vendor/github.com/gorilla/mux/route.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/route.go
rename to vendor/github.com/gorilla/mux/route.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/LICENSE b/vendor/github.com/hashicorp/go-msgpack/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/go-msgpack/LICENSE
rename to vendor/github.com/hashicorp/go-msgpack/LICENSE
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/0doc.go b/vendor/github.com/hashicorp/go-msgpack/codec/0doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/0doc.go
rename to vendor/github.com/hashicorp/go-msgpack/codec/0doc.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/README.md b/vendor/github.com/hashicorp/go-msgpack/codec/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/README.md
rename to vendor/github.com/hashicorp/go-msgpack/codec/README.md
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/binc.go b/vendor/github.com/hashicorp/go-msgpack/codec/binc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/binc.go
rename to vendor/github.com/hashicorp/go-msgpack/codec/binc.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/decode.go b/vendor/github.com/hashicorp/go-msgpack/codec/decode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/decode.go
rename to vendor/github.com/hashicorp/go-msgpack/codec/decode.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/encode.go b/vendor/github.com/hashicorp/go-msgpack/codec/encode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/encode.go
rename to vendor/github.com/hashicorp/go-msgpack/codec/encode.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/helper.go b/vendor/github.com/hashicorp/go-msgpack/codec/helper.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/helper.go
rename to vendor/github.com/hashicorp/go-msgpack/codec/helper.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/helper_internal.go b/vendor/github.com/hashicorp/go-msgpack/codec/helper_internal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/helper_internal.go
rename to vendor/github.com/hashicorp/go-msgpack/codec/helper_internal.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/msgpack.go b/vendor/github.com/hashicorp/go-msgpack/codec/msgpack.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/msgpack.go
rename to vendor/github.com/hashicorp/go-msgpack/codec/msgpack.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/msgpack_test.py b/vendor/github.com/hashicorp/go-msgpack/codec/msgpack_test.py
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/msgpack_test.py
rename to vendor/github.com/hashicorp/go-msgpack/codec/msgpack_test.py
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/rpc.go b/vendor/github.com/hashicorp/go-msgpack/codec/rpc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/rpc.go
rename to vendor/github.com/hashicorp/go-msgpack/codec/rpc.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/simple.go b/vendor/github.com/hashicorp/go-msgpack/codec/simple.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/simple.go
rename to vendor/github.com/hashicorp/go-msgpack/codec/simple.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/time.go b/vendor/github.com/hashicorp/go-msgpack/codec/time.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/time.go
rename to vendor/github.com/hashicorp/go-msgpack/codec/time.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/hashicorp/raft-boltdb/LICENSE b/vendor/github.com/hashicorp/raft-boltdb/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/LICENSE
rename to vendor/github.com/hashicorp/raft-boltdb/LICENSE
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/README.md b/vendor/github.com/hashicorp/raft-boltdb/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/README.md
rename to vendor/github.com/hashicorp/raft-boltdb/README.md
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/bolt_store.go b/vendor/github.com/hashicorp/raft-boltdb/bolt_store.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/bolt_store.go
rename to vendor/github.com/hashicorp/raft-boltdb/bolt_store.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/util.go b/vendor/github.com/hashicorp/raft-boltdb/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/util.go
rename to vendor/github.com/hashicorp/raft-boltdb/util.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/.gitignore b/vendor/github.com/hashicorp/raft/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/.gitignore
rename to vendor/github.com/hashicorp/raft/.gitignore
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/.travis.yml b/vendor/github.com/hashicorp/raft/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/.travis.yml
rename to vendor/github.com/hashicorp/raft/.travis.yml
diff --git a/vendor/github.com/hashicorp/raft/LICENSE b/vendor/github.com/hashicorp/raft/LICENSE
new file mode 100644
index 0000000000..c33dcc7c92
--- /dev/null
+++ b/vendor/github.com/hashicorp/raft/LICENSE
@@ -0,0 +1,354 @@
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. “Contributor”
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. “Contributor Version”
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor’s Contribution.
+
+1.3. “Contribution”
+
+     means Covered Software of a particular Contributor.
+
+1.4. “Covered Software”
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. “Incompatible With Secondary Licenses”
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of version
+        1.1 or earlier of the License, but not also under the terms of a
+        Secondary License.
+
+1.6. “Executable Form”
+
+     means any form of the work other than Source Code Form.
+
+1.7. “Larger Work”
+
+     means a work that combines Covered Software with other material, in a separate
+     file or files, that is not Covered Software.
+
+1.8. “License”
+
+     means this document.
+
+1.9. “Licensable”
+
+     means having the right to grant, to the maximum extent possible, whether at the
+     time of the initial grant or subsequently, any and all of the rights conveyed by
+     this License.
+
+1.10. “Modifications”
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to, deletion
+        from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. “Patent Claims” of a Contributor
+
+      means any patent claim(s), including without limitation, method, process,
+      and apparatus claims, in any patent Licensable by such Contributor that
+      would be infringed, but for the grant of the License, by the making,
+      using, selling, offering for sale, having made, import, or transfer of
+      either its Contributions or its Contributor Version.
+
+1.12. “Secondary License”
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. “Source Code Form”
+
+      means the form of the work preferred for making modifications.
+
+1.14. “You” (or “Your”)
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, “You” includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, “control” means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or as
+        part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its Contributions
+        or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution become
+     effective for each Contribution on the date the Contributor first distributes
+     such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under this
+     License. No additional rights or licenses will be implied from the distribution
+     or licensing of Covered Software under this License. Notwithstanding Section
+     2.1(b) above, no patent license is granted by a Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party’s
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of its
+        Contributions.
+
+     This License does not grant any rights in the trademarks, service marks, or
+     logos of any Contributor (except as may be necessary to comply with the
+     notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this License
+     (see Section 10.2) or under the terms of a Secondary License (if permitted
+     under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its Contributions
+     are its original creation(s) or it has sufficient rights to grant the
+     rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under applicable
+     copyright doctrines of fair use, fair dealing, or other equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under the
+     terms of this License. You must inform recipients that the Source Code Form
+     of the Covered Software is governed by the terms of this License, and how
+     they can obtain a copy of this License. You may not attempt to alter or
+     restrict the recipients’ rights in the Source Code Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this License,
+        or sublicense it under different terms, provided that the license for
+        the Executable Form does not attempt to limit or alter the recipients’
+        rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for the
+     Covered Software. If the Larger Work is a combination of Covered Software
+     with a work governed by one or more Secondary Licenses, and the Covered
+     Software is not Incompatible With Secondary Licenses, this License permits
+     You to additionally distribute such Covered Software under the terms of
+     such Secondary License(s), so that the recipient of the Larger Work may, at
+     their option, further distribute the Covered Software under the terms of
+     either this License or such Secondary License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices (including
+     copyright notices, patent notices, disclaimers of warranty, or limitations
+     of liability) contained within the Source Code Form of the Covered
+     Software, except that You may alter any license notices to the extent
+     required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on behalf
+     of any Contributor. You must make it absolutely clear that any such
+     warranty, support, indemnity, or liability obligation is offered by You
+     alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute, judicial
+   order, or regulation then You must: (a) comply with the terms of this License
+   to the maximum extent possible; and (b) describe the limitations and the code
+   they affect. Such description must be placed in a text file included with all
+   distributions of the Covered Software under this License. Except to the
+   extent prohibited by statute or regulation, such description must be
+   sufficiently detailed for a recipient of ordinary skill to be able to
+   understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
+     if such Contributor fails to notify You of the non-compliance by some
+     reasonable means prior to 60 days after You have come back into compliance.
+     Moreover, Your grants from a particular Contributor are reinstated on an
+     ongoing basis if such Contributor notifies You of the non-compliance by
+     some reasonable means, this is the first time You have received notice of
+     non-compliance with this License from such Contributor, and You become
+     compliant prior to 30 days after Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions, counter-claims,
+     and cross-claims) alleging that a Contributor Version directly or
+     indirectly infringes any patent, then the rights granted to You by any and
+     all Contributors for the Covered Software under Section 2.1 of this License
+     shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an “as is” basis, without
+   warranty of any kind, either expressed, implied, or statutory, including,
+   without limitation, warranties that the Covered Software is free of defects,
+   merchantable, fit for a particular purpose or non-infringing. The entire
+   risk as to the quality and performance of the Covered Software is with You.
+   Should any Covered Software prove defective in any respect, You (not any
+   Contributor) assume the cost of any necessary servicing, repair, or
+   correction. This disclaimer of warranty constitutes an essential part of this
+   License. No use of  any Covered Software is authorized under this License
+   except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from such
+   party’s negligence to the extent applicable law prohibits such limitation.
+   Some jurisdictions do not allow the exclusion or limitation of incidental or
+   consequential damages, so this exclusion and limitation may not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts of
+   a jurisdiction where the defendant maintains its principal place of business
+   and such litigation shall be governed by laws of that jurisdiction, without
+   reference to its conflict-of-law provisions. Nothing in this Section shall
+   prevent a party’s ability to bring cross-claims or counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject matter
+   hereof. If any provision of this License is held to be unenforceable, such
+   provision shall be reformed only to the extent necessary to make it
+   enforceable. Any law or regulation which provides that the language of a
+   contract shall be construed against the drafter shall not be used to construe
+   this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version of
+      the License under which You originally received the Covered Software, or
+      under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a modified
+      version of this License if you rename the license and remove any
+      references to the name of the license steward (except to note that such
+      modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
+      If You choose to distribute Source Code Form that is Incompatible With
+      Secondary Licenses under the terms of this version of the License, the
+      notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file, then
+You may include the notice in a location (such as a LICENSE file in a relevant
+directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - “Incompatible With Secondary Licenses” Notice
+
+      This Source Code Form is “Incompatible
+      With Secondary Licenses”, as defined by
+      the Mozilla Public License, v. 2.0.
+
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/Makefile b/vendor/github.com/hashicorp/raft/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/Makefile
rename to vendor/github.com/hashicorp/raft/Makefile
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/README.md b/vendor/github.com/hashicorp/raft/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/README.md
rename to vendor/github.com/hashicorp/raft/README.md
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/bench/bench.go b/vendor/github.com/hashicorp/raft/bench/bench.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/bench/bench.go
rename to vendor/github.com/hashicorp/raft/bench/bench.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/commands.go b/vendor/github.com/hashicorp/raft/commands.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/commands.go
rename to vendor/github.com/hashicorp/raft/commands.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/config.go b/vendor/github.com/hashicorp/raft/config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/config.go
rename to vendor/github.com/hashicorp/raft/config.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/discard_snapshot.go b/vendor/github.com/hashicorp/raft/discard_snapshot.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/discard_snapshot.go
rename to vendor/github.com/hashicorp/raft/discard_snapshot.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/file_snapshot.go b/vendor/github.com/hashicorp/raft/file_snapshot.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/file_snapshot.go
rename to vendor/github.com/hashicorp/raft/file_snapshot.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/fsm.go b/vendor/github.com/hashicorp/raft/fsm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/fsm.go
rename to vendor/github.com/hashicorp/raft/fsm.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/future.go b/vendor/github.com/hashicorp/raft/future.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/future.go
rename to vendor/github.com/hashicorp/raft/future.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/inflight.go b/vendor/github.com/hashicorp/raft/inflight.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/inflight.go
rename to vendor/github.com/hashicorp/raft/inflight.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/inmem_store.go b/vendor/github.com/hashicorp/raft/inmem_store.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/inmem_store.go
rename to vendor/github.com/hashicorp/raft/inmem_store.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/inmem_transport.go b/vendor/github.com/hashicorp/raft/inmem_transport.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/inmem_transport.go
rename to vendor/github.com/hashicorp/raft/inmem_transport.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/log.go b/vendor/github.com/hashicorp/raft/log.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/log.go
rename to vendor/github.com/hashicorp/raft/log.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/log_cache.go b/vendor/github.com/hashicorp/raft/log_cache.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/log_cache.go
rename to vendor/github.com/hashicorp/raft/log_cache.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/net_transport.go b/vendor/github.com/hashicorp/raft/net_transport.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/net_transport.go
rename to vendor/github.com/hashicorp/raft/net_transport.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/peer.go b/vendor/github.com/hashicorp/raft/peer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/peer.go
rename to vendor/github.com/hashicorp/raft/peer.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/raft.go b/vendor/github.com/hashicorp/raft/raft.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/raft.go
rename to vendor/github.com/hashicorp/raft/raft.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/replication.go b/vendor/github.com/hashicorp/raft/replication.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/replication.go
rename to vendor/github.com/hashicorp/raft/replication.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/snapshot.go b/vendor/github.com/hashicorp/raft/snapshot.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/snapshot.go
rename to vendor/github.com/hashicorp/raft/snapshot.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/stable.go b/vendor/github.com/hashicorp/raft/stable.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/stable.go
rename to vendor/github.com/hashicorp/raft/stable.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/state.go b/vendor/github.com/hashicorp/raft/state.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/state.go
rename to vendor/github.com/hashicorp/raft/state.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/tcp_transport.go b/vendor/github.com/hashicorp/raft/tcp_transport.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/tcp_transport.go
rename to vendor/github.com/hashicorp/raft/tcp_transport.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/transport.go b/vendor/github.com/hashicorp/raft/transport.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/transport.go
rename to vendor/github.com/hashicorp/raft/transport.go
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/util.go b/vendor/github.com/hashicorp/raft/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hashicorp/raft/util.go
rename to vendor/github.com/hashicorp/raft/util.go
diff --git a/vendor/github.com/hawkular/hawkular-client-go/LICENSE b/vendor/github.com/hawkular/hawkular-client-go/LICENSE
new file mode 100644
index 0000000000..8f71f43fee
--- /dev/null
+++ b/vendor/github.com/hawkular/hawkular-client-go/LICENSE
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/Godeps/_workspace/src/github.com/hawkular/hawkular-client-go/metrics/client.go b/vendor/github.com/hawkular/hawkular-client-go/metrics/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hawkular/hawkular-client-go/metrics/client.go
rename to vendor/github.com/hawkular/hawkular-client-go/metrics/client.go
diff --git a/Godeps/_workspace/src/github.com/hawkular/hawkular-client-go/metrics/helpers.go b/vendor/github.com/hawkular/hawkular-client-go/metrics/helpers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hawkular/hawkular-client-go/metrics/helpers.go
rename to vendor/github.com/hawkular/hawkular-client-go/metrics/helpers.go
diff --git a/Godeps/_workspace/src/github.com/hawkular/hawkular-client-go/metrics/types.go b/vendor/github.com/hawkular/hawkular-client-go/metrics/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/hawkular/hawkular-client-go/metrics/types.go
rename to vendor/github.com/hawkular/hawkular-client-go/metrics/types.go
diff --git a/Godeps/_workspace/src/github.com/imdario/mergo/.travis.yml b/vendor/github.com/imdario/mergo/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/imdario/mergo/.travis.yml
rename to vendor/github.com/imdario/mergo/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/imdario/mergo/LICENSE b/vendor/github.com/imdario/mergo/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/imdario/mergo/LICENSE
rename to vendor/github.com/imdario/mergo/LICENSE
diff --git a/Godeps/_workspace/src/github.com/imdario/mergo/README.md b/vendor/github.com/imdario/mergo/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/imdario/mergo/README.md
rename to vendor/github.com/imdario/mergo/README.md
diff --git a/Godeps/_workspace/src/github.com/imdario/mergo/doc.go b/vendor/github.com/imdario/mergo/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/imdario/mergo/doc.go
rename to vendor/github.com/imdario/mergo/doc.go
diff --git a/Godeps/_workspace/src/github.com/imdario/mergo/map.go b/vendor/github.com/imdario/mergo/map.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/imdario/mergo/map.go
rename to vendor/github.com/imdario/mergo/map.go
diff --git a/Godeps/_workspace/src/github.com/imdario/mergo/merge.go b/vendor/github.com/imdario/mergo/merge.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/imdario/mergo/merge.go
rename to vendor/github.com/imdario/mergo/merge.go
diff --git a/Godeps/_workspace/src/github.com/imdario/mergo/mergo.go b/vendor/github.com/imdario/mergo/mergo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/imdario/mergo/mergo.go
rename to vendor/github.com/imdario/mergo/mergo.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/inconshreveable/mousetrap/LICENSE b/vendor/github.com/inconshreveable/mousetrap/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/inconshreveable/mousetrap/LICENSE
rename to vendor/github.com/inconshreveable/mousetrap/LICENSE
diff --git a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/README.md b/vendor/github.com/inconshreveable/mousetrap/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/inconshreveable/mousetrap/README.md
rename to vendor/github.com/inconshreveable/mousetrap/README.md
diff --git a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_others.go b/vendor/github.com/inconshreveable/mousetrap/trap_others.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_others.go
rename to vendor/github.com/inconshreveable/mousetrap/trap_others.go
diff --git a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows.go b/vendor/github.com/inconshreveable/mousetrap/trap_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows.go
rename to vendor/github.com/inconshreveable/mousetrap/trap_windows.go
diff --git a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows_1.4.go b/vendor/github.com/inconshreveable/mousetrap/trap_windows_1.4.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows_1.4.go
rename to vendor/github.com/inconshreveable/mousetrap/trap_windows_1.4.go
diff --git a/vendor/github.com/influxdb/influxdb/LICENSE b/vendor/github.com/influxdb/influxdb/LICENSE
new file mode 100644
index 0000000000..d50222706c
--- /dev/null
+++ b/vendor/github.com/influxdb/influxdb/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-2015 Errplane Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/README.md b/vendor/github.com/influxdb/influxdb/client/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/client/README.md
rename to vendor/github.com/influxdb/influxdb/client/README.md
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb.go b/vendor/github.com/influxdb/influxdb/client/influxdb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb.go
rename to vendor/github.com/influxdb/influxdb/client/influxdb.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/INFLUXQL.md b/vendor/github.com/influxdb/influxdb/influxql/INFLUXQL.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/INFLUXQL.md
rename to vendor/github.com/influxdb/influxdb/influxql/INFLUXQL.md
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/NOTES b/vendor/github.com/influxdb/influxdb/influxql/NOTES
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/NOTES
rename to vendor/github.com/influxdb/influxdb/influxql/NOTES
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast.go b/vendor/github.com/influxdb/influxdb/influxql/ast.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast.go
rename to vendor/github.com/influxdb/influxdb/influxql/ast.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/doc.go b/vendor/github.com/influxdb/influxdb/influxql/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/doc.go
rename to vendor/github.com/influxdb/influxdb/influxql/doc.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/functions.go b/vendor/github.com/influxdb/influxdb/influxql/functions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/functions.go
rename to vendor/github.com/influxdb/influxdb/influxql/functions.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser.go b/vendor/github.com/influxdb/influxdb/influxql/parser.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser.go
rename to vendor/github.com/influxdb/influxdb/influxql/parser.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/result.go b/vendor/github.com/influxdb/influxdb/influxql/result.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/result.go
rename to vendor/github.com/influxdb/influxdb/influxql/result.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner.go b/vendor/github.com/influxdb/influxdb/influxql/scanner.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner.go
rename to vendor/github.com/influxdb/influxdb/influxql/scanner.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/token.go b/vendor/github.com/influxdb/influxdb/influxql/token.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/token.go
rename to vendor/github.com/influxdb/influxdb/influxql/token.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/config.go b/vendor/github.com/influxdb/influxdb/meta/config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/meta/config.go
rename to vendor/github.com/influxdb/influxdb/meta/config.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data.go b/vendor/github.com/influxdb/influxdb/meta/data.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data.go
rename to vendor/github.com/influxdb/influxdb/meta/data.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/errors.go b/vendor/github.com/influxdb/influxdb/meta/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/meta/errors.go
rename to vendor/github.com/influxdb/influxdb/meta/errors.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.pb.go b/vendor/github.com/influxdb/influxdb/meta/internal/meta.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.pb.go
rename to vendor/github.com/influxdb/influxdb/meta/internal/meta.pb.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.proto b/vendor/github.com/influxdb/influxdb/meta/internal/meta.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.proto
rename to vendor/github.com/influxdb/influxdb/meta/internal/meta.proto
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor.go b/vendor/github.com/influxdb/influxdb/meta/statement_executor.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor.go
rename to vendor/github.com/influxdb/influxdb/meta/statement_executor.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store.go b/vendor/github.com/influxdb/influxdb/meta/store.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store.go
rename to vendor/github.com/influxdb/influxdb/meta/store.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/snapshot/snapshot.go b/vendor/github.com/influxdb/influxdb/snapshot/snapshot.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/snapshot/snapshot.go
rename to vendor/github.com/influxdb/influxdb/snapshot/snapshot.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/toml/toml.go b/vendor/github.com/influxdb/influxdb/toml/toml.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/toml/toml.go
rename to vendor/github.com/influxdb/influxdb/toml/toml.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/README.md b/vendor/github.com/influxdb/influxdb/tsdb/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/README.md
rename to vendor/github.com/influxdb/influxdb/tsdb/README.md
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/batcher.go b/vendor/github.com/influxdb/influxdb/tsdb/batcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/batcher.go
rename to vendor/github.com/influxdb/influxdb/tsdb/batcher.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/config.go b/vendor/github.com/influxdb/influxdb/tsdb/config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/config.go
rename to vendor/github.com/influxdb/influxdb/tsdb/config.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/doc.go b/vendor/github.com/influxdb/influxdb/tsdb/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/doc.go
rename to vendor/github.com/influxdb/influxdb/tsdb/doc.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine.go b/vendor/github.com/influxdb/influxdb/tsdb/engine.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine.go
rename to vendor/github.com/influxdb/influxdb/tsdb/engine.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/internal/meta.pb.go b/vendor/github.com/influxdb/influxdb/tsdb/internal/meta.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/internal/meta.pb.go
rename to vendor/github.com/influxdb/influxdb/tsdb/internal/meta.pb.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/internal/meta.proto b/vendor/github.com/influxdb/influxdb/tsdb/internal/meta.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/internal/meta.proto
rename to vendor/github.com/influxdb/influxdb/tsdb/internal/meta.proto
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/mapper.go b/vendor/github.com/influxdb/influxdb/tsdb/mapper.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/mapper.go
rename to vendor/github.com/influxdb/influxdb/tsdb/mapper.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/meta.go b/vendor/github.com/influxdb/influxdb/tsdb/meta.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/meta.go
rename to vendor/github.com/influxdb/influxdb/tsdb/meta.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/monitor.go b/vendor/github.com/influxdb/influxdb/tsdb/monitor.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/monitor.go
rename to vendor/github.com/influxdb/influxdb/tsdb/monitor.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/points.go b/vendor/github.com/influxdb/influxdb/tsdb/points.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/points.go
rename to vendor/github.com/influxdb/influxdb/tsdb/points.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/query_executor.go b/vendor/github.com/influxdb/influxdb/tsdb/query_executor.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/query_executor.go
rename to vendor/github.com/influxdb/influxdb/tsdb/query_executor.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/shard.go b/vendor/github.com/influxdb/influxdb/tsdb/shard.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/shard.go
rename to vendor/github.com/influxdb/influxdb/tsdb/shard.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/snapshot_writer.go b/vendor/github.com/influxdb/influxdb/tsdb/snapshot_writer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/snapshot_writer.go
rename to vendor/github.com/influxdb/influxdb/tsdb/snapshot_writer.go
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/store.go b/vendor/github.com/influxdb/influxdb/tsdb/store.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/store.go
rename to vendor/github.com/influxdb/influxdb/tsdb/store.go
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.gitignore b/vendor/github.com/jmespath/go-jmespath/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/.gitignore
rename to vendor/github.com/jmespath/go-jmespath/.gitignore
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.travis.yml b/vendor/github.com/jmespath/go-jmespath/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/.travis.yml
rename to vendor/github.com/jmespath/go-jmespath/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/jmespath/go-jmespath/LICENSE b/vendor/github.com/jmespath/go-jmespath/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/jmespath/go-jmespath/LICENSE
rename to vendor/github.com/jmespath/go-jmespath/LICENSE
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/Makefile b/vendor/github.com/jmespath/go-jmespath/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/Makefile
rename to vendor/github.com/jmespath/go-jmespath/Makefile
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/README.md b/vendor/github.com/jmespath/go-jmespath/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/README.md
rename to vendor/github.com/jmespath/go-jmespath/README.md
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/api.go b/vendor/github.com/jmespath/go-jmespath/api.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/api.go
rename to vendor/github.com/jmespath/go-jmespath/api.go
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/astnodetype_string.go b/vendor/github.com/jmespath/go-jmespath/astnodetype_string.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/astnodetype_string.go
rename to vendor/github.com/jmespath/go-jmespath/astnodetype_string.go
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/cmd/jpgo/main.go b/vendor/github.com/jmespath/go-jmespath/cmd/jpgo/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/cmd/jpgo/main.go
rename to vendor/github.com/jmespath/go-jmespath/cmd/jpgo/main.go
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/basic.json b/vendor/github.com/jmespath/go-jmespath/compliance/basic.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/basic.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/basic.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/boolean.json b/vendor/github.com/jmespath/go-jmespath/compliance/boolean.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/boolean.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/boolean.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/current.json b/vendor/github.com/jmespath/go-jmespath/compliance/current.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/current.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/current.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/escape.json b/vendor/github.com/jmespath/go-jmespath/compliance/escape.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/escape.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/escape.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/filters.json b/vendor/github.com/jmespath/go-jmespath/compliance/filters.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/filters.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/filters.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/functions.json b/vendor/github.com/jmespath/go-jmespath/compliance/functions.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/functions.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/functions.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/identifiers.json b/vendor/github.com/jmespath/go-jmespath/compliance/identifiers.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/identifiers.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/identifiers.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/indices.json b/vendor/github.com/jmespath/go-jmespath/compliance/indices.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/indices.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/indices.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/literal.json b/vendor/github.com/jmespath/go-jmespath/compliance/literal.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/literal.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/literal.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/multiselect.json b/vendor/github.com/jmespath/go-jmespath/compliance/multiselect.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/multiselect.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/multiselect.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/ormatch.json b/vendor/github.com/jmespath/go-jmespath/compliance/ormatch.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/ormatch.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/ormatch.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/pipe.json b/vendor/github.com/jmespath/go-jmespath/compliance/pipe.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/pipe.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/pipe.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/slice.json b/vendor/github.com/jmespath/go-jmespath/compliance/slice.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/slice.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/slice.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/syntax.json b/vendor/github.com/jmespath/go-jmespath/compliance/syntax.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/syntax.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/syntax.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/unicode.json b/vendor/github.com/jmespath/go-jmespath/compliance/unicode.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/unicode.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/unicode.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/wildcard.json b/vendor/github.com/jmespath/go-jmespath/compliance/wildcard.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/compliance/wildcard.json
rename to vendor/github.com/jmespath/go-jmespath/compliance/wildcard.json
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/functions.go b/vendor/github.com/jmespath/go-jmespath/functions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/functions.go
rename to vendor/github.com/jmespath/go-jmespath/functions.go
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-1 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-1
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-1
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-1
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-10 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-10
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-10
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-10
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-100 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-100
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-100
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-100
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-101 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-101
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-101
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-101
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-102 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-102
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-102
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-102
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-103 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-103
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-103
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-103
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-104 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-104
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-104
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-104
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-105 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-105
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-105
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-105
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-106 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-106
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-106
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-106
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-107 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-107
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-107
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-107
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-108 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-108
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-108
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-108
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-109 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-109
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-109
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-109
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-110 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-110
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-110
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-110
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-112 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-112
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-112
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-112
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-115 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-115
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-115
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-115
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-118 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-118
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-118
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-118
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-119 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-119
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-119
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-119
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-12 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-12
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-12
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-12
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-120 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-120
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-120
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-120
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-121 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-121
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-121
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-121
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-122 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-122
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-122
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-122
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-123 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-123
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-123
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-123
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-126 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-126
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-126
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-126
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-128 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-128
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-128
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-128
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-129 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-129
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-129
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-129
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-13 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-13
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-13
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-13
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-130 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-130
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-130
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-130
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-131 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-131
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-131
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-131
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-132 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-132
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-132
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-132
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-133 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-133
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-133
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-133
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-134 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-134
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-134
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-134
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-135 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-135
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-135
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-135
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-136 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-136
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-136
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-136
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-137 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-137
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-137
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-137
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-138 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-138
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-138
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-138
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-139 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-139
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-139
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-139
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-14 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-14
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-14
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-14
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-140 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-140
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-140
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-140
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-141 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-141
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-141
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-141
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-142 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-142
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-142
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-142
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-143 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-143
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-143
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-143
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-144 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-144
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-144
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-144
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-145 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-145
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-145
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-145
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-146 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-146
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-146
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-146
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-147 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-147
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-147
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-147
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-148 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-148
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-148
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-148
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-149 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-149
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-149
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-149
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-15 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-15
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-15
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-15
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-150 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-150
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-150
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-150
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-151 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-151
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-151
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-151
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-152 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-152
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-152
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-152
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-153 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-153
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-153
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-153
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-155 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-155
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-155
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-155
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-156 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-156
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-156
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-156
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-157 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-157
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-157
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-157
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-158 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-158
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-158
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-158
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-159 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-159
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-159
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-159
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-16 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-16
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-16
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-16
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-160 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-160
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-160
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-160
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-161 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-161
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-161
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-161
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-162 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-162
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-162
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-162
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-163 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-163
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-163
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-163
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-164 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-164
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-164
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-164
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-165 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-165
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-165
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-165
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-166 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-166
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-166
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-166
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-167 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-167
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-167
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-167
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-168 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-168
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-168
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-168
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-169 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-169
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-169
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-169
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-17 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-17
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-17
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-17
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-170 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-170
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-170
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-170
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-171 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-171
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-171
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-171
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-172 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-172
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-172
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-172
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-173 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-173
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-173
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-173
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-174 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-174
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-174
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-174
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-175 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-175
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-175
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-175
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-178 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-178
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-178
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-178
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-179 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-179
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-179
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-179
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-18 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-18
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-18
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-18
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-180 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-180
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-180
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-180
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-181 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-181
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-181
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-181
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-182 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-182
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-182
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-182
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-183 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-183
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-183
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-183
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-184 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-184
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-184
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-184
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-185 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-185
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-185
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-185
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-186 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-186
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-186
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-186
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-187 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-187
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-187
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-187
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-188 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-188
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-188
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-188
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-189 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-189
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-189
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-189
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-19 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-19
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-19
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-19
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-190 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-190
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-190
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-190
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-191 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-191
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-191
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-191
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-192 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-192
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-192
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-192
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-193 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-193
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-193
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-193
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-194 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-194
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-194
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-194
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-195 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-195
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-195
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-195
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-196 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-196
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-196
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-196
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-198 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-198
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-198
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-198
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-199 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-199
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-199
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-199
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-2 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-2
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-2
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-2
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-20 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-20
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-20
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-20
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-200 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-200
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-200
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-200
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-201 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-201
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-201
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-201
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-202 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-202
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-202
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-202
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-203 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-203
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-203
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-203
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-204 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-204
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-204
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-204
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-205 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-205
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-205
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-205
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-206 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-206
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-206
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-206
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-207 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-207
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-207
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-207
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-208 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-208
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-208
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-208
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-209 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-209
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-209
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-209
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-21 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-21
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-21
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-21
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-210 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-210
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-210
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-210
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-211 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-211
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-211
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-211
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-212 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-212
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-212
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-212
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-213 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-213
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-213
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-213
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-214 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-214
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-214
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-214
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-215 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-215
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-215
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-215
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-216 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-216
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-216
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-216
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-217 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-217
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-217
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-217
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-218 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-218
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-218
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-218
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-219 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-219
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-219
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-219
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-22 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-22
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-22
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-22
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-220 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-220
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-220
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-220
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-221 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-221
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-221
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-221
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-222 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-222
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-222
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-222
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-223 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-223
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-223
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-223
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-224 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-224
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-224
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-224
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-225 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-225
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-225
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-225
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-226 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-226
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-226
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-226
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-227 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-227
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-227
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-227
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-228 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-228
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-228
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-228
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-229 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-229
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-229
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-229
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-23 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-23
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-23
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-23
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-230 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-230
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-230
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-230
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-231 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-231
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-231
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-231
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-232 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-232
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-232
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-232
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-233 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-233
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-233
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-233
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-234 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-234
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-234
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-234
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-235 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-235
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-235
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-235
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-236 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-236
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-236
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-236
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-237 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-237
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-237
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-237
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-238 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-238
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-238
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-238
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-239 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-239
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-239
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-239
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-24 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-24
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-24
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-24
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-240 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-240
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-240
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-240
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-241 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-241
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-241
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-241
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-242 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-242
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-242
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-242
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-243 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-243
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-243
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-243
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-244 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-244
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-244
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-244
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-245 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-245
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-245
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-245
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-246 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-246
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-246
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-246
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-247 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-247
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-247
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-247
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-248 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-248
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-248
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-248
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-249 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-249
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-249
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-249
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-25 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-25
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-25
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-25
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-250 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-250
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-250
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-250
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-251 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-251
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-251
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-251
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-252 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-252
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-252
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-252
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-253 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-253
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-253
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-253
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-254 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-254
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-254
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-254
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-255 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-255
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-255
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-255
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-256 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-256
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-256
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-256
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-257 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-257
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-257
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-257
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-258 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-258
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-258
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-258
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-259 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-259
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-259
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-259
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-26 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-26
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-26
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-26
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-260 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-260
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-260
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-260
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-261 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-261
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-261
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-261
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-262 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-262
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-262
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-262
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-263 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-263
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-263
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-263
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-264 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-264
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-264
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-264
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-265 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-265
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-265
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-265
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-266 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-266
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-266
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-266
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-267 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-267
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-267
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-267
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-268 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-268
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-268
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-268
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-269 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-269
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-269
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-269
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-27 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-27
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-27
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-27
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-270 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-270
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-270
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-270
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-271 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-271
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-271
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-271
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-272 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-272
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-272
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-272
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-273 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-273
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-273
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-273
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-274 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-274
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-274
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-274
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-275 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-275
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-275
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-275
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-276 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-276
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-276
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-276
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-277 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-277
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-277
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-277
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-278 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-278
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-278
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-278
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-279 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-279
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-279
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-279
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-28 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-28
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-28
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-28
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-280 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-280
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-280
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-280
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-281 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-281
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-281
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-281
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-282 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-282
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-282
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-282
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-283 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-283
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-283
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-283
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-284 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-284
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-284
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-284
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-285 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-285
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-285
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-285
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-286 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-286
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-286
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-286
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-287 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-287
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-287
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-287
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-288 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-288
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-288
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-288
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-289 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-289
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-289
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-289
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-29 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-29
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-29
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-29
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-290 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-290
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-290
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-290
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-291 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-291
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-291
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-291
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-292 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-292
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-292
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-292
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-293 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-293
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-293
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-293
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-294 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-294
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-294
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-294
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-295 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-295
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-295
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-295
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-296 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-296
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-296
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-296
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-297 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-297
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-297
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-297
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-298 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-298
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-298
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-298
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-299 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-299
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-299
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-299
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-3 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-3
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-3
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-3
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-30 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-30
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-30
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-30
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-300 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-300
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-300
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-300
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-301 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-301
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-301
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-301
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-302 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-302
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-302
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-302
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-303 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-303
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-303
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-303
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-304 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-304
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-304
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-304
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-305 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-305
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-305
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-305
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-306 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-306
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-306
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-306
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-307 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-307
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-307
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-307
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-308 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-308
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-308
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-308
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-309 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-309
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-309
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-309
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-31 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-31
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-31
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-31
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-310 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-310
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-310
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-310
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-311 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-311
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-311
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-311
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-312 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-312
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-312
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-312
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-313 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-313
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-313
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-313
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-314 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-314
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-314
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-314
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-315 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-315
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-315
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-315
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-316 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-316
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-316
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-316
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-317 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-317
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-317
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-317
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-318 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-318
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-318
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-318
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-319 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-319
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-319
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-319
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-32 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-32
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-32
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-32
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-320 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-320
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-320
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-320
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-321 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-321
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-321
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-321
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-322 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-322
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-322
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-322
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-323 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-323
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-323
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-323
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-324 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-324
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-324
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-324
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-325 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-325
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-325
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-325
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-326 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-326
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-326
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-326
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-327 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-327
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-327
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-327
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-328 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-328
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-328
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-328
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-329 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-329
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-329
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-329
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-33 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-33
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-33
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-33
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-330 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-330
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-330
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-330
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-331 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-331
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-331
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-331
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-332 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-332
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-332
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-332
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-333 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-333
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-333
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-333
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-334 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-334
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-334
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-334
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-335 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-335
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-335
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-335
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-336 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-336
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-336
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-336
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-337 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-337
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-337
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-337
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-338 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-338
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-338
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-338
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-339 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-339
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-339
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-339
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-34 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-34
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-34
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-34
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-340 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-340
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-340
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-340
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-341 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-341
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-341
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-341
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-342 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-342
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-342
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-342
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-343 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-343
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-343
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-343
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-344 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-344
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-344
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-344
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-345 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-345
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-345
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-345
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-346 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-346
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-346
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-346
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-347 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-347
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-347
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-347
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-348 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-348
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-348
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-348
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-349 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-349
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-349
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-349
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-35 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-35
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-35
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-35
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-350 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-350
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-350
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-350
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-351 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-351
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-351
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-351
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-352 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-352
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-352
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-352
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-353 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-353
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-353
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-353
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-354 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-354
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-354
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-354
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-355 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-355
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-355
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-355
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-356 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-356
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-356
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-356
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-357 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-357
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-357
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-357
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-358 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-358
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-358
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-358
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-359 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-359
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-359
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-359
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-36 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-36
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-36
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-36
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-360 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-360
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-360
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-360
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-361 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-361
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-361
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-361
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-362 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-362
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-362
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-362
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-363 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-363
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-363
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-363
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-364 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-364
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-364
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-364
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-365 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-365
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-365
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-365
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-366 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-366
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-366
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-366
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-367 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-367
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-367
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-367
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-368 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-368
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-368
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-368
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-369 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-369
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-369
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-369
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-37 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-37
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-37
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-37
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-370 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-370
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-370
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-370
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-371 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-371
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-371
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-371
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-372 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-372
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-372
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-372
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-373 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-373
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-373
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-373
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-374 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-374
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-374
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-374
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-375 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-375
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-375
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-375
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-376 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-376
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-376
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-376
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-377 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-377
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-377
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-377
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-378 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-378
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-378
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-378
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-379 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-379
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-379
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-379
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-38 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-38
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-38
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-38
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-380 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-380
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-380
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-380
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-381 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-381
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-381
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-381
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-382 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-382
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-382
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-382
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-383 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-383
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-383
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-383
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-384 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-384
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-384
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-384
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-385 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-385
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-385
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-385
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-386 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-386
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-386
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-386
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-387 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-387
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-387
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-387
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-388 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-388
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-388
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-388
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-389 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-389
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-389
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-389
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-39 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-39
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-39
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-39
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-390 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-390
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-390
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-390
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-391 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-391
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-391
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-391
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-392 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-392
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-392
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-392
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-393 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-393
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-393
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-393
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-394 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-394
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-394
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-394
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-395 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-395
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-395
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-395
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-396 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-396
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-396
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-396
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-397 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-397
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-397
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-397
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-398 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-398
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-398
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-398
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-399 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-399
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-399
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-399
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-4 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-4
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-4
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-4
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-40 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-40
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-40
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-40
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-400 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-400
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-400
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-400
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-401 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-401
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-401
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-401
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-402 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-402
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-402
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-402
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-403 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-403
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-403
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-403
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-404 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-404
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-404
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-404
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-405 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-405
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-405
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-405
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-406 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-406
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-406
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-406
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-407 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-407
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-407
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-407
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-408 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-408
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-408
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-408
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-409 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-409
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-409
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-409
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-41 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-41
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-41
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-41
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-410 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-410
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-410
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-410
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-411 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-411
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-411
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-411
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-412 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-412
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-412
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-412
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-413 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-413
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-413
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-413
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-414 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-414
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-414
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-414
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-415 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-415
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-415
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-415
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-416 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-416
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-416
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-416
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-417 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-417
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-417
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-417
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-418 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-418
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-418
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-418
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-419 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-419
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-419
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-419
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-42 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-42
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-42
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-42
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-420 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-420
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-420
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-420
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-421 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-421
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-421
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-421
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-422 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-422
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-422
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-422
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-423 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-423
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-423
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-423
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-424 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-424
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-424
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-424
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-425 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-425
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-425
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-425
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-426 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-426
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-426
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-426
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-427 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-427
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-427
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-427
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-428 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-428
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-428
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-428
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-429 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-429
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-429
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-429
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-43 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-43
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-43
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-43
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-430 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-430
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-430
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-430
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-431 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-431
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-431
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-431
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-432 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-432
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-432
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-432
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-433 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-433
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-433
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-433
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-434 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-434
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-434
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-434
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-435 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-435
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-435
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-435
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-436 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-436
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-436
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-436
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-437 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-437
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-437
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-437
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-438 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-438
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-438
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-438
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-439 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-439
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-439
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-439
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-44 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-44
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-44
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-44
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-440 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-440
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-440
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-440
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-441 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-441
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-441
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-441
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-442 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-442
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-442
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-442
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-443 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-443
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-443
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-443
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-444 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-444
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-444
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-444
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-445 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-445
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-445
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-445
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-446 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-446
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-446
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-446
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-447 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-447
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-447
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-447
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-448 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-448
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-448
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-448
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-449 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-449
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-449
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-449
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-45 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-45
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-45
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-45
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-450 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-450
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-450
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-450
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-451 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-451
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-451
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-451
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-452 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-452
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-452
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-452
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-453 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-453
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-453
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-453
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-454 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-454
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-454
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-454
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-455 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-455
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-455
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-455
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-456 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-456
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-456
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-456
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-457 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-457
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-457
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-457
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-458 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-458
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-458
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-458
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-459 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-459
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-459
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-459
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-46 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-46
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-46
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-46
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-460 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-460
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-460
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-460
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-461 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-461
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-461
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-461
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-462 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-462
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-462
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-462
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-463 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-463
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-463
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-463
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-464 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-464
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-464
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-464
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-465 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-465
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-465
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-465
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-466 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-466
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-466
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-466
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-467 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-467
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-467
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-467
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-468 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-468
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-468
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-468
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-469 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-469
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-469
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-469
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-47 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-47
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-47
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-47
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-470 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-470
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-470
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-470
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-471 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-471
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-471
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-471
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-472 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-472
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-472
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-472
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-473 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-473
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-473
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-473
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-474 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-474
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-474
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-474
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-475 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-475
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-475
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-475
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-476 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-476
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-476
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-476
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-477 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-477
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-477
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-477
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-478 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-478
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-478
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-478
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-479 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-479
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-479
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-479
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-48 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-48
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-48
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-48
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-480 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-480
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-480
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-480
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-481 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-481
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-481
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-481
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-482 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-482
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-482
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-482
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-483 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-483
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-483
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-483
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-484 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-484
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-484
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-484
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-485 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-485
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-485
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-485
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-486 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-486
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-486
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-486
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-487 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-487
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-487
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-487
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-488 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-488
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-488
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-488
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-489 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-489
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-489
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-489
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-49 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-49
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-49
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-49
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-490 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-490
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-490
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-490
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-491 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-491
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-491
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-491
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-492 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-492
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-492
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-492
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-493 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-493
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-493
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-493
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-494 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-494
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-494
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-494
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-495 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-495
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-495
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-495
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-496 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-496
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-496
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-496
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-497 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-497
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-497
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-497
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-498 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-498
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-498
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-498
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-499 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-499
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-499
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-499
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-5 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-5
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-5
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-5
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-50 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-50
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-50
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-50
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-500 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-500
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-500
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-500
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-501 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-501
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-501
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-501
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-502 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-502
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-502
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-502
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-503 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-503
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-503
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-503
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-504 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-504
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-504
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-504
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-505 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-505
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-505
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-505
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-506 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-506
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-506
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-506
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-507 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-507
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-507
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-507
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-508 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-508
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-508
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-508
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-509 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-509
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-509
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-509
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-51 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-51
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-51
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-51
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-510 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-510
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-510
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-510
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-511 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-511
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-511
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-511
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-512 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-512
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-512
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-512
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-513 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-513
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-513
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-513
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-514 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-514
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-514
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-514
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-515 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-515
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-515
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-515
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-516 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-516
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-516
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-516
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-517 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-517
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-517
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-517
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-518 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-518
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-518
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-518
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-519 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-519
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-519
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-519
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-52 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-52
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-52
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-52
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-520 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-520
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-520
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-520
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-521 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-521
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-521
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-521
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-522 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-522
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-522
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-522
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-523 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-523
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-523
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-523
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-524 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-524
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-524
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-524
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-525 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-525
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-525
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-525
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-526 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-526
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-526
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-526
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-527 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-527
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-527
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-527
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-528 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-528
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-528
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-528
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-529 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-529
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-529
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-529
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-53 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-53
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-53
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-53
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-530 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-530
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-530
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-530
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-531 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-531
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-531
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-531
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-532 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-532
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-532
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-532
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-533 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-533
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-533
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-533
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-534 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-534
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-534
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-534
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-535 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-535
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-535
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-535
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-536 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-536
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-536
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-536
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-537 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-537
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-537
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-537
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-538 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-538
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-538
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-538
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-539 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-539
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-539
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-539
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-54 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-54
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-54
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-54
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-540 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-540
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-540
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-540
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-541 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-541
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-541
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-541
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-542 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-542
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-542
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-542
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-543 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-543
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-543
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-543
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-544 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-544
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-544
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-544
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-545 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-545
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-545
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-545
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-546 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-546
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-546
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-546
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-547 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-547
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-547
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-547
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-548 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-548
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-548
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-548
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-549 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-549
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-549
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-549
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-55 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-55
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-55
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-55
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-550 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-550
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-550
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-550
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-551 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-551
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-551
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-551
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-552 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-552
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-552
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-552
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-553 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-553
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-553
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-553
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-554 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-554
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-554
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-554
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-555 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-555
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-555
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-555
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-556 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-556
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-556
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-556
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-557 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-557
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-557
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-557
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-558 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-558
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-558
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-558
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-559 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-559
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-559
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-559
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-56 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-56
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-56
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-56
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-560 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-560
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-560
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-560
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-561 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-561
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-561
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-561
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-562 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-562
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-562
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-562
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-563 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-563
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-563
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-563
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-564 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-564
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-564
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-564
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-565 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-565
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-565
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-565
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-566 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-566
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-566
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-566
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-567 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-567
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-567
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-567
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-568 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-568
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-568
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-568
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-569 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-569
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-569
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-569
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-57 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-57
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-57
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-57
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-570 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-570
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-570
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-570
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-571 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-571
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-571
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-571
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-572 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-572
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-572
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-572
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-573 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-573
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-573
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-573
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-574 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-574
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-574
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-574
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-575 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-575
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-575
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-575
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-576 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-576
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-576
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-576
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-577 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-577
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-577
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-577
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-578 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-578
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-578
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-578
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-579 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-579
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-579
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-579
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-58 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-58
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-58
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-58
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-580 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-580
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-580
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-580
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-581 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-581
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-581
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-581
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-582 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-582
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-582
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-582
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-583 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-583
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-583
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-583
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-584 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-584
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-584
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-584
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-585 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-585
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-585
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-585
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-586 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-586
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-586
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-586
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-587 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-587
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-587
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-587
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-588 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-588
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-588
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-588
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-589 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-589
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-589
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-589
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-59 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-59
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-59
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-59
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-590 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-590
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-590
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-590
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-591 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-591
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-591
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-591
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-592 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-592
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-592
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-592
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-593 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-593
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-593
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-593
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-594 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-594
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-594
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-594
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-595 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-595
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-595
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-595
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-596 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-596
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-596
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-596
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-597 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-597
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-597
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-597
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-598 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-598
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-598
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-598
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-599 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-599
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-599
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-599
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-6 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-6
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-6
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-6
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-60 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-60
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-60
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-60
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-600 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-600
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-600
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-600
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-601 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-601
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-601
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-601
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-602 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-602
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-602
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-602
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-603 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-603
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-603
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-603
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-604 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-604
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-604
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-604
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-605 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-605
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-605
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-605
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-606 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-606
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-606
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-606
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-607 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-607
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-607
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-607
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-608 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-608
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-608
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-608
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-609 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-609
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-609
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-609
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-61 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-61
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-61
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-61
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-610 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-610
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-610
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-610
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-611 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-611
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-611
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-611
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-612 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-612
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-612
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-612
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-613 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-613
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-613
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-613
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-614 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-614
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-614
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-614
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-615 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-615
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-615
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-615
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-616 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-616
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-616
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-616
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-617 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-617
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-617
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-617
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-618 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-618
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-618
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-618
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-619 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-619
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-619
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-619
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-62 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-62
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-62
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-62
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-620 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-620
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-620
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-620
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-621 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-621
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-621
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-621
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-622 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-622
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-622
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-622
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-623 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-623
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-623
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-623
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-624 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-624
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-624
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-624
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-625 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-625
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-625
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-625
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-626 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-626
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-626
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-626
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-627 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-627
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-627
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-627
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-628 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-628
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-628
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-628
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-629 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-629
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-629
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-629
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-63 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-63
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-63
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-63
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-630 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-630
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-630
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-630
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-631 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-631
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-631
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-631
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-632 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-632
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-632
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-632
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-633 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-633
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-633
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-633
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-634 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-634
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-634
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-634
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-635 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-635
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-635
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-635
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-636 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-636
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-636
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-636
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-637 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-637
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-637
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-637
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-638 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-638
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-638
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-638
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-639 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-639
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-639
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-639
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-64 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-64
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-64
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-64
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-640 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-640
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-640
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-640
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-641 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-641
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-641
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-641
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-642 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-642
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-642
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-642
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-643 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-643
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-643
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-643
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-644 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-644
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-644
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-644
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-645 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-645
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-645
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-645
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-646 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-646
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-646
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-646
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-647 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-647
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-647
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-647
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-648 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-648
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-648
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-648
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-649 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-649
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-649
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-649
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-65 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-65
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-65
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-65
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-650 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-650
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-650
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-650
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-651 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-651
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-651
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-651
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-652 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-652
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-652
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-652
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-653 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-653
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-653
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-653
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-654 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-654
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-654
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-654
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-655 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-655
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-655
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-655
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-656 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-656
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-656
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-656
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-66 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-66
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-66
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-66
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-67 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-67
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-67
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-67
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-68 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-68
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-68
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-68
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-69 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-69
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-69
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-69
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-7 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-7
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-7
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-7
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-70 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-70
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-70
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-70
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-71 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-71
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-71
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-71
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-72 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-72
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-72
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-72
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-73 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-73
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-73
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-73
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-74 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-74
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-74
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-74
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-75 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-75
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-75
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-75
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-76 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-76
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-76
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-76
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-77 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-77
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-77
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-77
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-78 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-78
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-78
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-78
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-79 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-79
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-79
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-79
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-8 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-8
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-8
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-8
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-80 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-80
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-80
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-80
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-81 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-81
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-81
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-81
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-82 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-82
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-82
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-82
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-83 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-83
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-83
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-83
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-84 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-84
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-84
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-84
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-85 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-85
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-85
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-85
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-86 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-86
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-86
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-86
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-87 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-87
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-87
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-87
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-88 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-88
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-88
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-88
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-89 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-89
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-89
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-89
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-9 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-9
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-9
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-9
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-90 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-90
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-90
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-90
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-91 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-91
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-91
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-91
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-92 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-92
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-92
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-92
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-93 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-93
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-93
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-93
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-94 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-94
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-94
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-94
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-95 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-95
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-95
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-95
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-96 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-96
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-96
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-96
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-97 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-97
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-97
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-97
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-98 b/vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-98
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/corpus/expr-98
rename to vendor/github.com/jmespath/go-jmespath/fuzz/corpus/expr-98
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/jmespath.go b/vendor/github.com/jmespath/go-jmespath/fuzz/jmespath.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/fuzz/jmespath.go
rename to vendor/github.com/jmespath/go-jmespath/fuzz/jmespath.go
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/interpreter.go b/vendor/github.com/jmespath/go-jmespath/interpreter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/interpreter.go
rename to vendor/github.com/jmespath/go-jmespath/interpreter.go
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/lexer.go b/vendor/github.com/jmespath/go-jmespath/lexer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/lexer.go
rename to vendor/github.com/jmespath/go-jmespath/lexer.go
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/parser.go b/vendor/github.com/jmespath/go-jmespath/parser.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/parser.go
rename to vendor/github.com/jmespath/go-jmespath/parser.go
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/toktype_string.go b/vendor/github.com/jmespath/go-jmespath/toktype_string.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/toktype_string.go
rename to vendor/github.com/jmespath/go-jmespath/toktype_string.go
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/util.go b/vendor/github.com/jmespath/go-jmespath/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jmespath/go-jmespath/util.go
rename to vendor/github.com/jmespath/go-jmespath/util.go
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/.gitignore b/vendor/github.com/jonboulle/clockwork/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/jonboulle/clockwork/.gitignore
rename to vendor/github.com/jonboulle/clockwork/.gitignore
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/.travis.yml b/vendor/github.com/jonboulle/clockwork/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/jonboulle/clockwork/.travis.yml
rename to vendor/github.com/jonboulle/clockwork/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/LICENSE b/vendor/github.com/jonboulle/clockwork/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/jonboulle/clockwork/LICENSE
rename to vendor/github.com/jonboulle/clockwork/LICENSE
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/README.md b/vendor/github.com/jonboulle/clockwork/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/jonboulle/clockwork/README.md
rename to vendor/github.com/jonboulle/clockwork/README.md
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/clockwork.go b/vendor/github.com/jonboulle/clockwork/clockwork.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/jonboulle/clockwork/clockwork.go
rename to vendor/github.com/jonboulle/clockwork/clockwork.go
diff --git a/Godeps/_workspace/src/github.com/juju/ratelimit/LICENSE b/vendor/github.com/juju/ratelimit/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/ratelimit/LICENSE
rename to vendor/github.com/juju/ratelimit/LICENSE
diff --git a/Godeps/_workspace/src/github.com/juju/ratelimit/README.md b/vendor/github.com/juju/ratelimit/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/ratelimit/README.md
rename to vendor/github.com/juju/ratelimit/README.md
diff --git a/Godeps/_workspace/src/github.com/juju/ratelimit/ratelimit.go b/vendor/github.com/juju/ratelimit/ratelimit.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/ratelimit/ratelimit.go
rename to vendor/github.com/juju/ratelimit/ratelimit.go
diff --git a/Godeps/_workspace/src/github.com/juju/ratelimit/reader.go b/vendor/github.com/juju/ratelimit/reader.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/juju/ratelimit/reader.go
rename to vendor/github.com/juju/ratelimit/reader.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/stevvooe/resumable/LICENSE b/vendor/github.com/kardianos/osext/LICENSE
similarity index 99%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/stevvooe/resumable/LICENSE
rename to vendor/github.com/kardianos/osext/LICENSE
index 2815cc36c9..7448756763 100644
--- a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/stevvooe/resumable/LICENSE
+++ b/vendor/github.com/kardianos/osext/LICENSE
@@ -25,4 +25,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/README.md b/vendor/github.com/kardianos/osext/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/kardianos/osext/README.md
rename to vendor/github.com/kardianos/osext/README.md
diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/osext.go b/vendor/github.com/kardianos/osext/osext.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kardianos/osext/osext.go
rename to vendor/github.com/kardianos/osext/osext.go
diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/osext_plan9.go b/vendor/github.com/kardianos/osext/osext_plan9.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kardianos/osext/osext_plan9.go
rename to vendor/github.com/kardianos/osext/osext_plan9.go
diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/osext_procfs.go b/vendor/github.com/kardianos/osext/osext_procfs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kardianos/osext/osext_procfs.go
rename to vendor/github.com/kardianos/osext/osext_procfs.go
diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/osext_sysctl.go b/vendor/github.com/kardianos/osext/osext_sysctl.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kardianos/osext/osext_sysctl.go
rename to vendor/github.com/kardianos/osext/osext_sysctl.go
diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/osext_windows.go b/vendor/github.com/kardianos/osext/osext_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kardianos/osext/osext_windows.go
rename to vendor/github.com/kardianos/osext/osext_windows.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/.gitignore b/vendor/github.com/kr/pty/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/.gitignore
rename to vendor/github.com/kr/pty/.gitignore
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/kr/pty/License b/vendor/github.com/kr/pty/License
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/kr/pty/License
rename to vendor/github.com/kr/pty/License
diff --git a/Godeps/_workspace/src/github.com/kr/pty/README.md b/vendor/github.com/kr/pty/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/README.md
rename to vendor/github.com/kr/pty/README.md
diff --git a/Godeps/_workspace/src/github.com/kr/pty/doc.go b/vendor/github.com/kr/pty/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/doc.go
rename to vendor/github.com/kr/pty/doc.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ioctl.go b/vendor/github.com/kr/pty/ioctl.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/ioctl.go
rename to vendor/github.com/kr/pty/ioctl.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ioctl_bsd.go b/vendor/github.com/kr/pty/ioctl_bsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/ioctl_bsd.go
rename to vendor/github.com/kr/pty/ioctl_bsd.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/mktypes.bash b/vendor/github.com/kr/pty/mktypes.bash
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/mktypes.bash
rename to vendor/github.com/kr/pty/mktypes.bash
diff --git a/Godeps/_workspace/src/github.com/kr/pty/pty_darwin.go b/vendor/github.com/kr/pty/pty_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/pty_darwin.go
rename to vendor/github.com/kr/pty/pty_darwin.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/pty_freebsd.go b/vendor/github.com/kr/pty/pty_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/pty_freebsd.go
rename to vendor/github.com/kr/pty/pty_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/pty_linux.go b/vendor/github.com/kr/pty/pty_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/pty_linux.go
rename to vendor/github.com/kr/pty/pty_linux.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/pty_unsupported.go b/vendor/github.com/kr/pty/pty_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/pty_unsupported.go
rename to vendor/github.com/kr/pty/pty_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/run.go b/vendor/github.com/kr/pty/run.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/run.go
rename to vendor/github.com/kr/pty/run.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/types.go b/vendor/github.com/kr/pty/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/types.go
rename to vendor/github.com/kr/pty/types.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/types_freebsd.go b/vendor/github.com/kr/pty/types_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/types_freebsd.go
rename to vendor/github.com/kr/pty/types_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/util.go b/vendor/github.com/kr/pty/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/util.go
rename to vendor/github.com/kr/pty/util.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_386.go b/vendor/github.com/kr/pty/ztypes_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/ztypes_386.go
rename to vendor/github.com/kr/pty/ztypes_386.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_amd64.go b/vendor/github.com/kr/pty/ztypes_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/ztypes_amd64.go
rename to vendor/github.com/kr/pty/ztypes_amd64.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_arm.go b/vendor/github.com/kr/pty/ztypes_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/ztypes_arm.go
rename to vendor/github.com/kr/pty/ztypes_arm.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_arm64.go b/vendor/github.com/kr/pty/ztypes_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/ztypes_arm64.go
rename to vendor/github.com/kr/pty/ztypes_arm64.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_386.go b/vendor/github.com/kr/pty/ztypes_freebsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_386.go
rename to vendor/github.com/kr/pty/ztypes_freebsd_386.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_amd64.go b/vendor/github.com/kr/pty/ztypes_freebsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_amd64.go
rename to vendor/github.com/kr/pty/ztypes_freebsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_arm.go b/vendor/github.com/kr/pty/ztypes_freebsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_arm.go
rename to vendor/github.com/kr/pty/ztypes_freebsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_ppc64.go b/vendor/github.com/kr/pty/ztypes_ppc64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/ztypes_ppc64.go
rename to vendor/github.com/kr/pty/ztypes_ppc64.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_ppc64le.go b/vendor/github.com/kr/pty/ztypes_ppc64le.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/ztypes_ppc64le.go
rename to vendor/github.com/kr/pty/ztypes_ppc64le.go
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_s390x.go b/vendor/github.com/kr/pty/ztypes_s390x.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kr/pty/ztypes_s390x.go
rename to vendor/github.com/kr/pty/ztypes_s390x.go
diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/LICENSE b/vendor/github.com/matttproud/golang_protobuf_extensions/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/LICENSE
rename to vendor/github.com/matttproud/golang_protobuf_extensions/LICENSE
diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/decode.go b/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/decode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/decode.go
rename to vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/decode.go
diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go b/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go
rename to vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go
diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/encode.go b/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/encode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/encode.go
rename to vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/encode.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/LICENSE b/vendor/github.com/mesos/mesos-go/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/LICENSE
rename to vendor/github.com/mesos/mesos-go/LICENSE
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/NOTICE b/vendor/github.com/mesos/mesos-go/NOTICE
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/NOTICE
rename to vendor/github.com/mesos/mesos-go/NOTICE
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/auth/callback/interface.go b/vendor/github.com/mesos/mesos-go/auth/callback/interface.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/auth/callback/interface.go
rename to vendor/github.com/mesos/mesos-go/auth/callback/interface.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/auth/callback/interprocess.go b/vendor/github.com/mesos/mesos-go/auth/callback/interprocess.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/auth/callback/interprocess.go
rename to vendor/github.com/mesos/mesos-go/auth/callback/interprocess.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/auth/callback/name.go b/vendor/github.com/mesos/mesos-go/auth/callback/name.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/auth/callback/name.go
rename to vendor/github.com/mesos/mesos-go/auth/callback/name.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/auth/callback/password.go b/vendor/github.com/mesos/mesos-go/auth/callback/password.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/auth/callback/password.go
rename to vendor/github.com/mesos/mesos-go/auth/callback/password.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/auth/interface.go b/vendor/github.com/mesos/mesos-go/auth/interface.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/auth/interface.go
rename to vendor/github.com/mesos/mesos-go/auth/interface.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/auth/login.go b/vendor/github.com/mesos/mesos-go/auth/login.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/auth/login.go
rename to vendor/github.com/mesos/mesos-go/auth/login.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/auth/sasl/authenticatee.go b/vendor/github.com/mesos/mesos-go/auth/sasl/authenticatee.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/auth/sasl/authenticatee.go
rename to vendor/github.com/mesos/mesos-go/auth/sasl/authenticatee.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/auth/sasl/context.go b/vendor/github.com/mesos/mesos-go/auth/sasl/context.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/auth/sasl/context.go
rename to vendor/github.com/mesos/mesos-go/auth/sasl/context.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/auth/sasl/mech/crammd5/mechanism.go b/vendor/github.com/mesos/mesos-go/auth/sasl/mech/crammd5/mechanism.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/auth/sasl/mech/crammd5/mechanism.go
rename to vendor/github.com/mesos/mesos-go/auth/sasl/mech/crammd5/mechanism.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/auth/sasl/mech/interface.go b/vendor/github.com/mesos/mesos-go/auth/sasl/mech/interface.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/auth/sasl/mech/interface.go
rename to vendor/github.com/mesos/mesos-go/auth/sasl/mech/interface.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/auth/sasl/mech/plugins.go b/vendor/github.com/mesos/mesos-go/auth/sasl/mech/plugins.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/auth/sasl/mech/plugins.go
rename to vendor/github.com/mesos/mesos-go/auth/sasl/mech/plugins.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/auth/sasl/mock/mock.go b/vendor/github.com/mesos/mesos-go/auth/sasl/mock/mock.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/auth/sasl/mock/mock.go
rename to vendor/github.com/mesos/mesos-go/auth/sasl/mock/mock.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/doc.go b/vendor/github.com/mesos/mesos-go/detector/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/detector/doc.go
rename to vendor/github.com/mesos/mesos-go/detector/doc.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/factory.go b/vendor/github.com/mesos/mesos-go/detector/factory.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/detector/factory.go
rename to vendor/github.com/mesos/mesos-go/detector/factory.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/interface.go b/vendor/github.com/mesos/mesos-go/detector/interface.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/detector/interface.go
rename to vendor/github.com/mesos/mesos-go/detector/interface.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/standalone.go b/vendor/github.com/mesos/mesos-go/detector/standalone.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/detector/standalone.go
rename to vendor/github.com/mesos/mesos-go/detector/standalone.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/client2.go b/vendor/github.com/mesos/mesos-go/detector/zoo/client2.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/client2.go
rename to vendor/github.com/mesos/mesos-go/detector/zoo/client2.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/detect.go b/vendor/github.com/mesos/mesos-go/detector/zoo/detect.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/detect.go
rename to vendor/github.com/mesos/mesos-go/detector/zoo/detect.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/doc.go b/vendor/github.com/mesos/mesos-go/detector/zoo/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/doc.go
rename to vendor/github.com/mesos/mesos-go/detector/zoo/doc.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/mock/conn.go b/vendor/github.com/mesos/mesos-go/detector/zoo/mock/conn.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/mock/conn.go
rename to vendor/github.com/mesos/mesos-go/detector/zoo/mock/conn.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/mock/mock.go b/vendor/github.com/mesos/mesos-go/detector/zoo/mock/mock.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/mock/mock.go
rename to vendor/github.com/mesos/mesos-go/detector/zoo/mock/mock.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/plugin.go b/vendor/github.com/mesos/mesos-go/detector/zoo/plugin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/plugin.go
rename to vendor/github.com/mesos/mesos-go/detector/zoo/plugin.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/types.go b/vendor/github.com/mesos/mesos-go/detector/zoo/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/types.go
rename to vendor/github.com/mesos/mesos-go/detector/zoo/types.go
diff --git a/vendor/github.com/mesos/mesos-go/examples/Godeps/_workspace/src/github.com/golang/glog/LICENSE b/vendor/github.com/mesos/mesos-go/examples/Godeps/_workspace/src/github.com/golang/glog/LICENSE
new file mode 100644
index 0000000000..37ec93a14f
--- /dev/null
+++ b/vendor/github.com/mesos/mesos-go/examples/Godeps/_workspace/src/github.com/golang/glog/LICENSE
@@ -0,0 +1,191 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/mesos/mesos-go/examples/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE b/vendor/github.com/mesos/mesos-go/examples/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE
new file mode 100644
index 0000000000..5dc68268d9
--- /dev/null
+++ b/vendor/github.com/mesos/mesos-go/examples/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009,2014 Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/mesos/mesos-go/examples/Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md b/vendor/github.com/mesos/mesos-go/examples/Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md
new file mode 100644
index 0000000000..2199945813
--- /dev/null
+++ b/vendor/github.com/mesos/mesos-go/examples/Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md
@@ -0,0 +1,23 @@
+objx - by Mat Ryer and Tyler Bunnell
+
+The MIT License (MIT)
+
+Copyright (c) 2014 Stretchr, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/executor/doc.go b/vendor/github.com/mesos/mesos-go/executor/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/executor/doc.go
rename to vendor/github.com/mesos/mesos-go/executor/doc.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/executor/exectype.go b/vendor/github.com/mesos/mesos-go/executor/exectype.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/executor/exectype.go
rename to vendor/github.com/mesos/mesos-go/executor/exectype.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/executor/executor.go b/vendor/github.com/mesos/mesos-go/executor/executor.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/executor/executor.go
rename to vendor/github.com/mesos/mesos-go/executor/executor.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/executor/mock/mock.go b/vendor/github.com/mesos/mesos-go/executor/mock/mock.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/executor/mock/mock.go
rename to vendor/github.com/mesos/mesos-go/executor/mock/mock.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/executor/testing.go b/vendor/github.com/mesos/mesos-go/executor/testing.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/executor/testing.go
rename to vendor/github.com/mesos/mesos-go/executor/testing.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/Makefile b/vendor/github.com/mesos/mesos-go/mesosproto/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/Makefile
rename to vendor/github.com/mesos/mesos-go/mesosproto/Makefile
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/authentication.pb.go b/vendor/github.com/mesos/mesos-go/mesosproto/authentication.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/authentication.pb.go
rename to vendor/github.com/mesos/mesos-go/mesosproto/authentication.pb.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/authentication.proto b/vendor/github.com/mesos/mesos-go/mesosproto/authentication.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/authentication.proto
rename to vendor/github.com/mesos/mesos-go/mesosproto/authentication.proto
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/internal.pb.go b/vendor/github.com/mesos/mesos-go/mesosproto/internal.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/internal.pb.go
rename to vendor/github.com/mesos/mesos-go/mesosproto/internal.pb.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/internal.proto b/vendor/github.com/mesos/mesos-go/mesosproto/internal.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/internal.proto
rename to vendor/github.com/mesos/mesos-go/mesosproto/internal.proto
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/mesos.pb.go b/vendor/github.com/mesos/mesos-go/mesosproto/mesos.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/mesos.pb.go
rename to vendor/github.com/mesos/mesos-go/mesosproto/mesos.pb.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/mesos.proto b/vendor/github.com/mesos/mesos-go/mesosproto/mesos.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/mesos.proto
rename to vendor/github.com/mesos/mesos-go/mesosproto/mesos.proto
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/messages.pb.go b/vendor/github.com/mesos/mesos-go/mesosproto/messages.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/messages.pb.go
rename to vendor/github.com/mesos/mesos-go/mesosproto/messages.pb.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/messages.proto b/vendor/github.com/mesos/mesos-go/mesosproto/messages.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/messages.proto
rename to vendor/github.com/mesos/mesos-go/mesosproto/messages.proto
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/scheduler/scheduler.pb.go b/vendor/github.com/mesos/mesos-go/mesosproto/scheduler/scheduler.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/scheduler/scheduler.pb.go
rename to vendor/github.com/mesos/mesos-go/mesosproto/scheduler/scheduler.pb.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/scheduler/scheduler.proto b/vendor/github.com/mesos/mesos-go/mesosproto/scheduler/scheduler.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/mesosproto/scheduler/scheduler.proto
rename to vendor/github.com/mesos/mesos-go/mesosproto/scheduler/scheduler.proto
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/mesosutil/constants.go b/vendor/github.com/mesos/mesos-go/mesosutil/constants.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/mesosutil/constants.go
rename to vendor/github.com/mesos/mesos-go/mesosutil/constants.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/mesosutil/mesosprotoutil.go b/vendor/github.com/mesos/mesos-go/mesosutil/mesosprotoutil.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/mesosutil/mesosprotoutil.go
rename to vendor/github.com/mesos/mesos-go/mesosutil/mesosprotoutil.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/mesosutil/node.go b/vendor/github.com/mesos/mesos-go/mesosutil/node.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/mesosutil/node.go
rename to vendor/github.com/mesos/mesos-go/mesosutil/node.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/mesosutil/process/process.go b/vendor/github.com/mesos/mesos-go/mesosutil/process/process.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/mesosutil/process/process.go
rename to vendor/github.com/mesos/mesos-go/mesosutil/process/process.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/README.md b/vendor/github.com/mesos/mesos-go/messenger/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/README.md
rename to vendor/github.com/mesos/mesos-go/messenger/README.md
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/decoder.go b/vendor/github.com/mesos/mesos-go/messenger/decoder.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/decoder.go
rename to vendor/github.com/mesos/mesos-go/messenger/decoder.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/doc.go b/vendor/github.com/mesos/mesos-go/messenger/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/doc.go
rename to vendor/github.com/mesos/mesos-go/messenger/doc.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/http_transporter.go b/vendor/github.com/mesos/mesos-go/messenger/http_transporter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/http_transporter.go
rename to vendor/github.com/mesos/mesos-go/messenger/http_transporter.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/message.go b/vendor/github.com/mesos/mesos-go/messenger/message.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/message.go
rename to vendor/github.com/mesos/mesos-go/messenger/message.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/messenger.go b/vendor/github.com/mesos/mesos-go/messenger/messenger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/messenger.go
rename to vendor/github.com/mesos/mesos-go/messenger/messenger.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/mock/messenger.go b/vendor/github.com/mesos/mesos-go/messenger/mock/messenger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/mock/messenger.go
rename to vendor/github.com/mesos/mesos-go/messenger/mock/messenger.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/sessionid/sessionid.go b/vendor/github.com/mesos/mesos-go/messenger/sessionid/sessionid.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/sessionid/sessionid.go
rename to vendor/github.com/mesos/mesos-go/messenger/sessionid/sessionid.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/testmessage/Makefile b/vendor/github.com/mesos/mesos-go/messenger/testmessage/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/testmessage/Makefile
rename to vendor/github.com/mesos/mesos-go/messenger/testmessage/Makefile
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/testmessage/generator.go b/vendor/github.com/mesos/mesos-go/messenger/testmessage/generator.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/testmessage/generator.go
rename to vendor/github.com/mesos/mesos-go/messenger/testmessage/generator.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/testmessage/testmessage.pb.go b/vendor/github.com/mesos/mesos-go/messenger/testmessage/testmessage.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/testmessage/testmessage.pb.go
rename to vendor/github.com/mesos/mesos-go/messenger/testmessage/testmessage.pb.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/testmessage/testmessage.proto b/vendor/github.com/mesos/mesos-go/messenger/testmessage/testmessage.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/testmessage/testmessage.proto
rename to vendor/github.com/mesos/mesos-go/messenger/testmessage/testmessage.proto
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/transporter.go b/vendor/github.com/mesos/mesos-go/messenger/transporter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/messenger/transporter.go
rename to vendor/github.com/mesos/mesos-go/messenger/transporter.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/doc.go b/vendor/github.com/mesos/mesos-go/scheduler/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/doc.go
rename to vendor/github.com/mesos/mesos-go/scheduler/doc.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/handler.go b/vendor/github.com/mesos/mesos-go/scheduler/handler.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/handler.go
rename to vendor/github.com/mesos/mesos-go/scheduler/handler.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/mock/scheduler.go b/vendor/github.com/mesos/mesos-go/scheduler/mock/scheduler.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/mock/scheduler.go
rename to vendor/github.com/mesos/mesos-go/scheduler/mock/scheduler.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/plugins.go b/vendor/github.com/mesos/mesos-go/scheduler/plugins.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/plugins.go
rename to vendor/github.com/mesos/mesos-go/scheduler/plugins.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/schedcache.go b/vendor/github.com/mesos/mesos-go/scheduler/schedcache.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/schedcache.go
rename to vendor/github.com/mesos/mesos-go/scheduler/schedcache.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/schedtype.go b/vendor/github.com/mesos/mesos-go/scheduler/schedtype.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/schedtype.go
rename to vendor/github.com/mesos/mesos-go/scheduler/schedtype.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/scheduler.go b/vendor/github.com/mesos/mesos-go/scheduler/scheduler.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/scheduler.go
rename to vendor/github.com/mesos/mesos-go/scheduler/scheduler.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/testing.go b/vendor/github.com/mesos/mesos-go/scheduler/testing.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/scheduler/testing.go
rename to vendor/github.com/mesos/mesos-go/scheduler/testing.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/upid/doc.go b/vendor/github.com/mesos/mesos-go/upid/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/upid/doc.go
rename to vendor/github.com/mesos/mesos-go/upid/doc.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/upid/upid.go b/vendor/github.com/mesos/mesos-go/upid/upid.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mesos/mesos-go/upid/upid.go
rename to vendor/github.com/mesos/mesos-go/upid/upid.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/.gitignore b/vendor/github.com/miekg/dns/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/.gitignore
rename to vendor/github.com/miekg/dns/.gitignore
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/.travis.yml b/vendor/github.com/miekg/dns/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/.travis.yml
rename to vendor/github.com/miekg/dns/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/AUTHORS b/vendor/github.com/miekg/dns/AUTHORS
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/AUTHORS
rename to vendor/github.com/miekg/dns/AUTHORS
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/CONTRIBUTORS b/vendor/github.com/miekg/dns/CONTRIBUTORS
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/CONTRIBUTORS
rename to vendor/github.com/miekg/dns/CONTRIBUTORS
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/COPYRIGHT b/vendor/github.com/miekg/dns/COPYRIGHT
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/COPYRIGHT
rename to vendor/github.com/miekg/dns/COPYRIGHT
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/LICENSE b/vendor/github.com/miekg/dns/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/LICENSE
rename to vendor/github.com/miekg/dns/LICENSE
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/README.md b/vendor/github.com/miekg/dns/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/README.md
rename to vendor/github.com/miekg/dns/README.md
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/client.go b/vendor/github.com/miekg/dns/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/client.go
rename to vendor/github.com/miekg/dns/client.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/clientconfig.go b/vendor/github.com/miekg/dns/clientconfig.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/clientconfig.go
rename to vendor/github.com/miekg/dns/clientconfig.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/defaults.go b/vendor/github.com/miekg/dns/defaults.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/defaults.go
rename to vendor/github.com/miekg/dns/defaults.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/dns.go b/vendor/github.com/miekg/dns/dns.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/dns.go
rename to vendor/github.com/miekg/dns/dns.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/dnssec.go b/vendor/github.com/miekg/dns/dnssec.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/dnssec.go
rename to vendor/github.com/miekg/dns/dnssec.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/edns.go b/vendor/github.com/miekg/dns/edns.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/edns.go
rename to vendor/github.com/miekg/dns/edns.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/idn/punycode.go b/vendor/github.com/miekg/dns/idn/punycode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/idn/punycode.go
rename to vendor/github.com/miekg/dns/idn/punycode.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/keygen.go b/vendor/github.com/miekg/dns/keygen.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/keygen.go
rename to vendor/github.com/miekg/dns/keygen.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/kscan.go b/vendor/github.com/miekg/dns/kscan.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/kscan.go
rename to vendor/github.com/miekg/dns/kscan.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/labels.go b/vendor/github.com/miekg/dns/labels.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/labels.go
rename to vendor/github.com/miekg/dns/labels.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/msg.go b/vendor/github.com/miekg/dns/msg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/msg.go
rename to vendor/github.com/miekg/dns/msg.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/nsecx.go b/vendor/github.com/miekg/dns/nsecx.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/nsecx.go
rename to vendor/github.com/miekg/dns/nsecx.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/privaterr.go b/vendor/github.com/miekg/dns/privaterr.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/privaterr.go
rename to vendor/github.com/miekg/dns/privaterr.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/rawmsg.go b/vendor/github.com/miekg/dns/rawmsg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/rawmsg.go
rename to vendor/github.com/miekg/dns/rawmsg.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/scanner.go b/vendor/github.com/miekg/dns/scanner.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/scanner.go
rename to vendor/github.com/miekg/dns/scanner.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/server.go b/vendor/github.com/miekg/dns/server.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/server.go
rename to vendor/github.com/miekg/dns/server.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/sig0.go b/vendor/github.com/miekg/dns/sig0.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/sig0.go
rename to vendor/github.com/miekg/dns/sig0.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/singleinflight.go b/vendor/github.com/miekg/dns/singleinflight.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/singleinflight.go
rename to vendor/github.com/miekg/dns/singleinflight.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/tlsa.go b/vendor/github.com/miekg/dns/tlsa.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/tlsa.go
rename to vendor/github.com/miekg/dns/tlsa.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/tsig.go b/vendor/github.com/miekg/dns/tsig.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/tsig.go
rename to vendor/github.com/miekg/dns/tsig.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/types.go b/vendor/github.com/miekg/dns/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/types.go
rename to vendor/github.com/miekg/dns/types.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/udp.go b/vendor/github.com/miekg/dns/udp.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/udp.go
rename to vendor/github.com/miekg/dns/udp.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/udp_linux.go b/vendor/github.com/miekg/dns/udp_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/udp_linux.go
rename to vendor/github.com/miekg/dns/udp_linux.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/udp_other.go b/vendor/github.com/miekg/dns/udp_other.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/udp_other.go
rename to vendor/github.com/miekg/dns/udp_other.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/udp_windows.go b/vendor/github.com/miekg/dns/udp_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/udp_windows.go
rename to vendor/github.com/miekg/dns/udp_windows.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/update.go b/vendor/github.com/miekg/dns/update.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/update.go
rename to vendor/github.com/miekg/dns/update.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/xfr.go b/vendor/github.com/miekg/dns/xfr.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/xfr.go
rename to vendor/github.com/miekg/dns/xfr.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/zgenerate.go b/vendor/github.com/miekg/dns/zgenerate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/zgenerate.go
rename to vendor/github.com/miekg/dns/zgenerate.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/zscan.go b/vendor/github.com/miekg/dns/zscan.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/zscan.go
rename to vendor/github.com/miekg/dns/zscan.go
diff --git a/Godeps/_workspace/src/github.com/miekg/dns/zscan_rr.go b/vendor/github.com/miekg/dns/zscan_rr.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/miekg/dns/zscan_rr.go
rename to vendor/github.com/miekg/dns/zscan_rr.go
diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/.gitignore b/vendor/github.com/mistifyio/go-zfs/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/.gitignore
rename to vendor/github.com/mistifyio/go-zfs/.gitignore
diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/CONTRIBUTING.md b/vendor/github.com/mistifyio/go-zfs/CONTRIBUTING.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/CONTRIBUTING.md
rename to vendor/github.com/mistifyio/go-zfs/CONTRIBUTING.md
diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/LICENSE b/vendor/github.com/mistifyio/go-zfs/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/LICENSE
rename to vendor/github.com/mistifyio/go-zfs/LICENSE
diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/README.md b/vendor/github.com/mistifyio/go-zfs/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/README.md
rename to vendor/github.com/mistifyio/go-zfs/README.md
diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/Vagrantfile b/vendor/github.com/mistifyio/go-zfs/Vagrantfile
similarity index 100%
rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/Vagrantfile
rename to vendor/github.com/mistifyio/go-zfs/Vagrantfile
diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/error.go b/vendor/github.com/mistifyio/go-zfs/error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/error.go
rename to vendor/github.com/mistifyio/go-zfs/error.go
diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/utils.go b/vendor/github.com/mistifyio/go-zfs/utils.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/utils.go
rename to vendor/github.com/mistifyio/go-zfs/utils.go
diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/zfs.go b/vendor/github.com/mistifyio/go-zfs/zfs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/zfs.go
rename to vendor/github.com/mistifyio/go-zfs/zfs.go
diff --git a/Godeps/_workspace/src/github.com/mistifyio/go-zfs/zpool.go b/vendor/github.com/mistifyio/go-zfs/zpool.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mistifyio/go-zfs/zpool.go
rename to vendor/github.com/mistifyio/go-zfs/zpool.go
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/bugsnag/panicwrap/LICENSE b/vendor/github.com/mitchellh/mapstructure/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/bugsnag/panicwrap/LICENSE
rename to vendor/github.com/mitchellh/mapstructure/LICENSE
diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/README.md b/vendor/github.com/mitchellh/mapstructure/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/README.md
rename to vendor/github.com/mitchellh/mapstructure/README.md
diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks.go b/vendor/github.com/mitchellh/mapstructure/decode_hooks.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/decode_hooks.go
rename to vendor/github.com/mitchellh/mapstructure/decode_hooks.go
diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/error.go b/vendor/github.com/mitchellh/mapstructure/error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/error.go
rename to vendor/github.com/mitchellh/mapstructure/error.go
diff --git a/Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure.go b/vendor/github.com/mitchellh/mapstructure/mapstructure.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mitchellh/mapstructure/mapstructure.go
rename to vendor/github.com/mitchellh/mapstructure/mapstructure.go
diff --git a/Godeps/_workspace/src/github.com/mvdan/xurls/.gitignore b/vendor/github.com/mvdan/xurls/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/mvdan/xurls/.gitignore
rename to vendor/github.com/mvdan/xurls/.gitignore
diff --git a/Godeps/_workspace/src/github.com/mvdan/xurls/.travis.yml b/vendor/github.com/mvdan/xurls/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/mvdan/xurls/.travis.yml
rename to vendor/github.com/mvdan/xurls/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/mvdan/xurls/LICENSE b/vendor/github.com/mvdan/xurls/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/mvdan/xurls/LICENSE
rename to vendor/github.com/mvdan/xurls/LICENSE
diff --git a/Godeps/_workspace/src/github.com/mvdan/xurls/README.md b/vendor/github.com/mvdan/xurls/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/mvdan/xurls/README.md
rename to vendor/github.com/mvdan/xurls/README.md
diff --git a/Godeps/_workspace/src/github.com/mvdan/xurls/cmd/xurls/main.go b/vendor/github.com/mvdan/xurls/cmd/xurls/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mvdan/xurls/cmd/xurls/main.go
rename to vendor/github.com/mvdan/xurls/cmd/xurls/main.go
diff --git a/Godeps/_workspace/src/github.com/mvdan/xurls/generate/regexgen/main.go b/vendor/github.com/mvdan/xurls/generate/regexgen/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mvdan/xurls/generate/regexgen/main.go
rename to vendor/github.com/mvdan/xurls/generate/regexgen/main.go
diff --git a/Godeps/_workspace/src/github.com/mvdan/xurls/generate/tldsgen/main.go b/vendor/github.com/mvdan/xurls/generate/tldsgen/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mvdan/xurls/generate/tldsgen/main.go
rename to vendor/github.com/mvdan/xurls/generate/tldsgen/main.go
diff --git a/Godeps/_workspace/src/github.com/mvdan/xurls/regex.go b/vendor/github.com/mvdan/xurls/regex.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mvdan/xurls/regex.go
rename to vendor/github.com/mvdan/xurls/regex.go
diff --git a/Godeps/_workspace/src/github.com/mvdan/xurls/schemes.go b/vendor/github.com/mvdan/xurls/schemes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mvdan/xurls/schemes.go
rename to vendor/github.com/mvdan/xurls/schemes.go
diff --git a/Godeps/_workspace/src/github.com/mvdan/xurls/tlds.go b/vendor/github.com/mvdan/xurls/tlds.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mvdan/xurls/tlds.go
rename to vendor/github.com/mvdan/xurls/tlds.go
diff --git a/Godeps/_workspace/src/github.com/mvdan/xurls/tlds_pseudo.go b/vendor/github.com/mvdan/xurls/tlds_pseudo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mvdan/xurls/tlds_pseudo.go
rename to vendor/github.com/mvdan/xurls/tlds_pseudo.go
diff --git a/Godeps/_workspace/src/github.com/mvdan/xurls/xurls.go b/vendor/github.com/mvdan/xurls/xurls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mvdan/xurls/xurls.go
rename to vendor/github.com/mvdan/xurls/xurls.go
diff --git a/Godeps/_workspace/src/github.com/mxk/go-flowrate/LICENSE b/vendor/github.com/mxk/go-flowrate/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/mxk/go-flowrate/LICENSE
rename to vendor/github.com/mxk/go-flowrate/LICENSE
diff --git a/Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate/flowrate.go b/vendor/github.com/mxk/go-flowrate/flowrate/flowrate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate/flowrate.go
rename to vendor/github.com/mxk/go-flowrate/flowrate/flowrate.go
diff --git a/Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate/io.go b/vendor/github.com/mxk/go-flowrate/flowrate/io.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate/io.go
rename to vendor/github.com/mxk/go-flowrate/flowrate/io.go
diff --git a/Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate/util.go b/vendor/github.com/mxk/go-flowrate/flowrate/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate/util.go
rename to vendor/github.com/mxk/go-flowrate/flowrate/util.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/.gitignore b/vendor/github.com/onsi/ginkgo/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/.gitignore
rename to vendor/github.com/onsi/ginkgo/.gitignore
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/.travis.yml b/vendor/github.com/onsi/ginkgo/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/.travis.yml
rename to vendor/github.com/onsi/ginkgo/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/CHANGELOG.md b/vendor/github.com/onsi/ginkgo/CHANGELOG.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/CHANGELOG.md
rename to vendor/github.com/onsi/ginkgo/CHANGELOG.md
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/LICENSE b/vendor/github.com/onsi/ginkgo/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/LICENSE
rename to vendor/github.com/onsi/ginkgo/LICENSE
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/README.md b/vendor/github.com/onsi/ginkgo/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/README.md
rename to vendor/github.com/onsi/ginkgo/README.md
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/config/config.go b/vendor/github.com/onsi/ginkgo/config/config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/config/config.go
rename to vendor/github.com/onsi/ginkgo/config/config.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/extensions/table/table.go b/vendor/github.com/onsi/ginkgo/extensions/table/table.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/extensions/table/table.go
rename to vendor/github.com/onsi/ginkgo/extensions/table/table.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/extensions/table/table_entry.go b/vendor/github.com/onsi/ginkgo/extensions/table/table_entry.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/extensions/table/table_entry.go
rename to vendor/github.com/onsi/ginkgo/extensions/table/table_entry.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/bootstrap_command.go b/vendor/github.com/onsi/ginkgo/ginkgo/bootstrap_command.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/bootstrap_command.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/bootstrap_command.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/build_command.go b/vendor/github.com/onsi/ginkgo/ginkgo/build_command.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/build_command.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/build_command.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/convert/ginkgo_ast_nodes.go b/vendor/github.com/onsi/ginkgo/ginkgo/convert/ginkgo_ast_nodes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/convert/ginkgo_ast_nodes.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/convert/ginkgo_ast_nodes.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/convert/import.go b/vendor/github.com/onsi/ginkgo/ginkgo/convert/import.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/convert/import.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/convert/import.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/convert/package_rewriter.go b/vendor/github.com/onsi/ginkgo/ginkgo/convert/package_rewriter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/convert/package_rewriter.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/convert/package_rewriter.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/convert/test_finder.go b/vendor/github.com/onsi/ginkgo/ginkgo/convert/test_finder.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/convert/test_finder.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/convert/test_finder.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/convert/testfile_rewriter.go b/vendor/github.com/onsi/ginkgo/ginkgo/convert/testfile_rewriter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/convert/testfile_rewriter.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/convert/testfile_rewriter.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/convert/testing_t_rewriter.go b/vendor/github.com/onsi/ginkgo/ginkgo/convert/testing_t_rewriter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/convert/testing_t_rewriter.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/convert/testing_t_rewriter.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/convert_command.go b/vendor/github.com/onsi/ginkgo/ginkgo/convert_command.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/convert_command.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/convert_command.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/generate_command.go b/vendor/github.com/onsi/ginkgo/ginkgo/generate_command.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/generate_command.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/generate_command.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/help_command.go b/vendor/github.com/onsi/ginkgo/ginkgo/help_command.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/help_command.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/help_command.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/interrupthandler/interrupt_handler.go b/vendor/github.com/onsi/ginkgo/ginkgo/interrupthandler/interrupt_handler.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/interrupthandler/interrupt_handler.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/interrupthandler/interrupt_handler.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/interrupthandler/sigquit_swallower_unix.go b/vendor/github.com/onsi/ginkgo/ginkgo/interrupthandler/sigquit_swallower_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/interrupthandler/sigquit_swallower_unix.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/interrupthandler/sigquit_swallower_unix.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/interrupthandler/sigquit_swallower_windows.go b/vendor/github.com/onsi/ginkgo/ginkgo/interrupthandler/sigquit_swallower_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/interrupthandler/sigquit_swallower_windows.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/interrupthandler/sigquit_swallower_windows.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/main.go b/vendor/github.com/onsi/ginkgo/ginkgo/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/main.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/main.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/nodot/nodot.go b/vendor/github.com/onsi/ginkgo/ginkgo/nodot/nodot.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/nodot/nodot.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/nodot/nodot.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/nodot_command.go b/vendor/github.com/onsi/ginkgo/ginkgo/nodot_command.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/nodot_command.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/nodot_command.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/notifications.go b/vendor/github.com/onsi/ginkgo/ginkgo/notifications.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/notifications.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/notifications.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/run_command.go b/vendor/github.com/onsi/ginkgo/ginkgo/run_command.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/run_command.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/run_command.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/run_watch_and_build_command_flags.go b/vendor/github.com/onsi/ginkgo/ginkgo/run_watch_and_build_command_flags.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/run_watch_and_build_command_flags.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/run_watch_and_build_command_flags.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/suite_runner.go b/vendor/github.com/onsi/ginkgo/ginkgo/suite_runner.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/suite_runner.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/suite_runner.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/testrunner/log_writer.go b/vendor/github.com/onsi/ginkgo/ginkgo/testrunner/log_writer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/testrunner/log_writer.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/testrunner/log_writer.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/testrunner/run_result.go b/vendor/github.com/onsi/ginkgo/ginkgo/testrunner/run_result.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/testrunner/run_result.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/testrunner/run_result.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/testrunner/test_runner.go b/vendor/github.com/onsi/ginkgo/ginkgo/testrunner/test_runner.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/testrunner/test_runner.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/testrunner/test_runner.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/testsuite/test_suite.go b/vendor/github.com/onsi/ginkgo/ginkgo/testsuite/test_suite.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/testsuite/test_suite.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/testsuite/test_suite.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/testsuite/vendor_check_go15.go b/vendor/github.com/onsi/ginkgo/ginkgo/testsuite/vendor_check_go15.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/testsuite/vendor_check_go15.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/testsuite/vendor_check_go15.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/testsuite/vendor_check_go16.go b/vendor/github.com/onsi/ginkgo/ginkgo/testsuite/vendor_check_go16.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/testsuite/vendor_check_go16.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/testsuite/vendor_check_go16.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/unfocus_command.go b/vendor/github.com/onsi/ginkgo/ginkgo/unfocus_command.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/unfocus_command.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/unfocus_command.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/version_command.go b/vendor/github.com/onsi/ginkgo/ginkgo/version_command.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/version_command.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/version_command.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/watch/delta.go b/vendor/github.com/onsi/ginkgo/ginkgo/watch/delta.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/watch/delta.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/watch/delta.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/watch/delta_tracker.go b/vendor/github.com/onsi/ginkgo/ginkgo/watch/delta_tracker.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/watch/delta_tracker.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/watch/delta_tracker.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/watch/dependencies.go b/vendor/github.com/onsi/ginkgo/ginkgo/watch/dependencies.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/watch/dependencies.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/watch/dependencies.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/watch/package_hash.go b/vendor/github.com/onsi/ginkgo/ginkgo/watch/package_hash.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/watch/package_hash.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/watch/package_hash.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/watch/package_hashes.go b/vendor/github.com/onsi/ginkgo/ginkgo/watch/package_hashes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/watch/package_hashes.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/watch/package_hashes.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/watch/suite.go b/vendor/github.com/onsi/ginkgo/ginkgo/watch/suite.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/watch/suite.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/watch/suite.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/watch_command.go b/vendor/github.com/onsi/ginkgo/ginkgo/watch_command.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/watch_command.go
rename to vendor/github.com/onsi/ginkgo/ginkgo/watch_command.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo_dsl.go b/vendor/github.com/onsi/ginkgo/ginkgo_dsl.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo_dsl.go
rename to vendor/github.com/onsi/ginkgo/ginkgo_dsl.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/integration/integration.go b/vendor/github.com/onsi/ginkgo/integration/integration.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/integration/integration.go
rename to vendor/github.com/onsi/ginkgo/integration/integration.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/codelocation/code_location.go b/vendor/github.com/onsi/ginkgo/internal/codelocation/code_location.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/codelocation/code_location.go
rename to vendor/github.com/onsi/ginkgo/internal/codelocation/code_location.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/containernode/container_node.go b/vendor/github.com/onsi/ginkgo/internal/containernode/container_node.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/containernode/container_node.go
rename to vendor/github.com/onsi/ginkgo/internal/containernode/container_node.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/failer/failer.go b/vendor/github.com/onsi/ginkgo/internal/failer/failer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/failer/failer.go
rename to vendor/github.com/onsi/ginkgo/internal/failer/failer.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/benchmarker.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/benchmarker.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/benchmarker.go
rename to vendor/github.com/onsi/ginkgo/internal/leafnodes/benchmarker.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/interfaces.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/interfaces.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/interfaces.go
rename to vendor/github.com/onsi/ginkgo/internal/leafnodes/interfaces.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/it_node.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/it_node.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/it_node.go
rename to vendor/github.com/onsi/ginkgo/internal/leafnodes/it_node.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/measure_node.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/measure_node.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/measure_node.go
rename to vendor/github.com/onsi/ginkgo/internal/leafnodes/measure_node.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/runner.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/runner.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/runner.go
rename to vendor/github.com/onsi/ginkgo/internal/leafnodes/runner.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/setup_nodes.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/setup_nodes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/setup_nodes.go
rename to vendor/github.com/onsi/ginkgo/internal/leafnodes/setup_nodes.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/suite_nodes.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/suite_nodes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/suite_nodes.go
rename to vendor/github.com/onsi/ginkgo/internal/leafnodes/suite_nodes.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/synchronized_after_suite_node.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/synchronized_after_suite_node.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/synchronized_after_suite_node.go
rename to vendor/github.com/onsi/ginkgo/internal/leafnodes/synchronized_after_suite_node.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/synchronized_before_suite_node.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/synchronized_before_suite_node.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/leafnodes/synchronized_before_suite_node.go
rename to vendor/github.com/onsi/ginkgo/internal/leafnodes/synchronized_before_suite_node.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/aggregator.go b/vendor/github.com/onsi/ginkgo/internal/remote/aggregator.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/aggregator.go
rename to vendor/github.com/onsi/ginkgo/internal/remote/aggregator.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/forwarding_reporter.go b/vendor/github.com/onsi/ginkgo/internal/remote/forwarding_reporter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/forwarding_reporter.go
rename to vendor/github.com/onsi/ginkgo/internal/remote/forwarding_reporter.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/output_interceptor.go b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/output_interceptor.go
rename to vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/output_interceptor_unix.go b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/output_interceptor_unix.go
rename to vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_unix.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/output_interceptor_win.go b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_win.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/output_interceptor_win.go
rename to vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_win.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/server.go b/vendor/github.com/onsi/ginkgo/internal/remote/server.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/server.go
rename to vendor/github.com/onsi/ginkgo/internal/remote/server.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/syscall_dup_linux_arm64.go b/vendor/github.com/onsi/ginkgo/internal/remote/syscall_dup_linux_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/syscall_dup_linux_arm64.go
rename to vendor/github.com/onsi/ginkgo/internal/remote/syscall_dup_linux_arm64.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/syscall_dup_unix.go b/vendor/github.com/onsi/ginkgo/internal/remote/syscall_dup_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/remote/syscall_dup_unix.go
rename to vendor/github.com/onsi/ginkgo/internal/remote/syscall_dup_unix.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/spec/index_computer.go b/vendor/github.com/onsi/ginkgo/internal/spec/index_computer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/spec/index_computer.go
rename to vendor/github.com/onsi/ginkgo/internal/spec/index_computer.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/spec/spec.go b/vendor/github.com/onsi/ginkgo/internal/spec/spec.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/spec/spec.go
rename to vendor/github.com/onsi/ginkgo/internal/spec/spec.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/spec/specs.go b/vendor/github.com/onsi/ginkgo/internal/spec/specs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/spec/specs.go
rename to vendor/github.com/onsi/ginkgo/internal/spec/specs.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/specrunner/random_id.go b/vendor/github.com/onsi/ginkgo/internal/specrunner/random_id.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/specrunner/random_id.go
rename to vendor/github.com/onsi/ginkgo/internal/specrunner/random_id.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/specrunner/spec_runner.go b/vendor/github.com/onsi/ginkgo/internal/specrunner/spec_runner.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/specrunner/spec_runner.go
rename to vendor/github.com/onsi/ginkgo/internal/specrunner/spec_runner.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/suite/suite.go b/vendor/github.com/onsi/ginkgo/internal/suite/suite.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/suite/suite.go
rename to vendor/github.com/onsi/ginkgo/internal/suite/suite.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/testingtproxy/testing_t_proxy.go b/vendor/github.com/onsi/ginkgo/internal/testingtproxy/testing_t_proxy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/testingtproxy/testing_t_proxy.go
rename to vendor/github.com/onsi/ginkgo/internal/testingtproxy/testing_t_proxy.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/writer/fake_writer.go b/vendor/github.com/onsi/ginkgo/internal/writer/fake_writer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/writer/fake_writer.go
rename to vendor/github.com/onsi/ginkgo/internal/writer/fake_writer.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/internal/writer/writer.go b/vendor/github.com/onsi/ginkgo/internal/writer/writer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/internal/writer/writer.go
rename to vendor/github.com/onsi/ginkgo/internal/writer/writer.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/default_reporter.go b/vendor/github.com/onsi/ginkgo/reporters/default_reporter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/default_reporter.go
rename to vendor/github.com/onsi/ginkgo/reporters/default_reporter.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/fake_reporter.go b/vendor/github.com/onsi/ginkgo/reporters/fake_reporter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/fake_reporter.go
rename to vendor/github.com/onsi/ginkgo/reporters/fake_reporter.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/junit_reporter.go b/vendor/github.com/onsi/ginkgo/reporters/junit_reporter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/junit_reporter.go
rename to vendor/github.com/onsi/ginkgo/reporters/junit_reporter.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/reporter.go b/vendor/github.com/onsi/ginkgo/reporters/reporter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/reporter.go
rename to vendor/github.com/onsi/ginkgo/reporters/reporter.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/stenographer/console_logging.go b/vendor/github.com/onsi/ginkgo/reporters/stenographer/console_logging.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/stenographer/console_logging.go
rename to vendor/github.com/onsi/ginkgo/reporters/stenographer/console_logging.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/stenographer/fake_stenographer.go b/vendor/github.com/onsi/ginkgo/reporters/stenographer/fake_stenographer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/stenographer/fake_stenographer.go
rename to vendor/github.com/onsi/ginkgo/reporters/stenographer/fake_stenographer.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/stenographer/stenographer.go b/vendor/github.com/onsi/ginkgo/reporters/stenographer/stenographer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/stenographer/stenographer.go
rename to vendor/github.com/onsi/ginkgo/reporters/stenographer/stenographer.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/teamcity_reporter.go b/vendor/github.com/onsi/ginkgo/reporters/teamcity_reporter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/reporters/teamcity_reporter.go
rename to vendor/github.com/onsi/ginkgo/reporters/teamcity_reporter.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/types/code_location.go b/vendor/github.com/onsi/ginkgo/types/code_location.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/types/code_location.go
rename to vendor/github.com/onsi/ginkgo/types/code_location.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/types/synchronization.go b/vendor/github.com/onsi/ginkgo/types/synchronization.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/types/synchronization.go
rename to vendor/github.com/onsi/ginkgo/types/synchronization.go
diff --git a/Godeps/_workspace/src/github.com/onsi/ginkgo/types/types.go b/vendor/github.com/onsi/ginkgo/types/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/ginkgo/types/types.go
rename to vendor/github.com/onsi/ginkgo/types/types.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/.gitignore b/vendor/github.com/onsi/gomega/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/.gitignore
rename to vendor/github.com/onsi/gomega/.gitignore
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/.travis.yml b/vendor/github.com/onsi/gomega/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/.travis.yml
rename to vendor/github.com/onsi/gomega/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/CHANGELOG.md b/vendor/github.com/onsi/gomega/CHANGELOG.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/CHANGELOG.md
rename to vendor/github.com/onsi/gomega/CHANGELOG.md
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/LICENSE b/vendor/github.com/onsi/gomega/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/LICENSE
rename to vendor/github.com/onsi/gomega/LICENSE
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/README.md b/vendor/github.com/onsi/gomega/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/README.md
rename to vendor/github.com/onsi/gomega/README.md
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/format/format.go b/vendor/github.com/onsi/gomega/format/format.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/format/format.go
rename to vendor/github.com/onsi/gomega/format/format.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/gbytes/buffer.go b/vendor/github.com/onsi/gomega/gbytes/buffer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/gbytes/buffer.go
rename to vendor/github.com/onsi/gomega/gbytes/buffer.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/gbytes/say_matcher.go b/vendor/github.com/onsi/gomega/gbytes/say_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/gbytes/say_matcher.go
rename to vendor/github.com/onsi/gomega/gbytes/say_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/gexec/build.go b/vendor/github.com/onsi/gomega/gexec/build.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/gexec/build.go
rename to vendor/github.com/onsi/gomega/gexec/build.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/gexec/exit_matcher.go b/vendor/github.com/onsi/gomega/gexec/exit_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/gexec/exit_matcher.go
rename to vendor/github.com/onsi/gomega/gexec/exit_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/gexec/prefixed_writer.go b/vendor/github.com/onsi/gomega/gexec/prefixed_writer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/gexec/prefixed_writer.go
rename to vendor/github.com/onsi/gomega/gexec/prefixed_writer.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/gexec/session.go b/vendor/github.com/onsi/gomega/gexec/session.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/gexec/session.go
rename to vendor/github.com/onsi/gomega/gexec/session.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/ghttp/handlers.go b/vendor/github.com/onsi/gomega/ghttp/handlers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/ghttp/handlers.go
rename to vendor/github.com/onsi/gomega/ghttp/handlers.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/ghttp/protobuf/protobuf.go b/vendor/github.com/onsi/gomega/ghttp/protobuf/protobuf.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/ghttp/protobuf/protobuf.go
rename to vendor/github.com/onsi/gomega/ghttp/protobuf/protobuf.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/ghttp/protobuf/simple_message.pb.go b/vendor/github.com/onsi/gomega/ghttp/protobuf/simple_message.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/ghttp/protobuf/simple_message.pb.go
rename to vendor/github.com/onsi/gomega/ghttp/protobuf/simple_message.pb.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/ghttp/protobuf/simple_message.proto b/vendor/github.com/onsi/gomega/ghttp/protobuf/simple_message.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/ghttp/protobuf/simple_message.proto
rename to vendor/github.com/onsi/gomega/ghttp/protobuf/simple_message.proto
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/ghttp/test_server.go b/vendor/github.com/onsi/gomega/ghttp/test_server.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/ghttp/test_server.go
rename to vendor/github.com/onsi/gomega/ghttp/test_server.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/gomega_dsl.go b/vendor/github.com/onsi/gomega/gomega_dsl.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/gomega_dsl.go
rename to vendor/github.com/onsi/gomega/gomega_dsl.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/internal/assertion/assertion.go b/vendor/github.com/onsi/gomega/internal/assertion/assertion.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/internal/assertion/assertion.go
rename to vendor/github.com/onsi/gomega/internal/assertion/assertion.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/internal/asyncassertion/async_assertion.go b/vendor/github.com/onsi/gomega/internal/asyncassertion/async_assertion.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/internal/asyncassertion/async_assertion.go
rename to vendor/github.com/onsi/gomega/internal/asyncassertion/async_assertion.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/internal/fakematcher/fake_matcher.go b/vendor/github.com/onsi/gomega/internal/fakematcher/fake_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/internal/fakematcher/fake_matcher.go
rename to vendor/github.com/onsi/gomega/internal/fakematcher/fake_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/internal/oraclematcher/oracle_matcher.go b/vendor/github.com/onsi/gomega/internal/oraclematcher/oracle_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/internal/oraclematcher/oracle_matcher.go
rename to vendor/github.com/onsi/gomega/internal/oraclematcher/oracle_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/internal/testingtsupport/testing_t_support.go b/vendor/github.com/onsi/gomega/internal/testingtsupport/testing_t_support.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/internal/testingtsupport/testing_t_support.go
rename to vendor/github.com/onsi/gomega/internal/testingtsupport/testing_t_support.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers.go b/vendor/github.com/onsi/gomega/matchers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers.go
rename to vendor/github.com/onsi/gomega/matchers.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/and.go b/vendor/github.com/onsi/gomega/matchers/and.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/and.go
rename to vendor/github.com/onsi/gomega/matchers/and.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/assignable_to_type_of_matcher.go b/vendor/github.com/onsi/gomega/matchers/assignable_to_type_of_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/assignable_to_type_of_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/assignable_to_type_of_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_a_directory.go b/vendor/github.com/onsi/gomega/matchers/be_a_directory.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_a_directory.go
rename to vendor/github.com/onsi/gomega/matchers/be_a_directory.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_a_regular_file.go b/vendor/github.com/onsi/gomega/matchers/be_a_regular_file.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_a_regular_file.go
rename to vendor/github.com/onsi/gomega/matchers/be_a_regular_file.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_an_existing_file.go b/vendor/github.com/onsi/gomega/matchers/be_an_existing_file.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_an_existing_file.go
rename to vendor/github.com/onsi/gomega/matchers/be_an_existing_file.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_closed_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_closed_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_closed_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/be_closed_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_empty_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_empty_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_empty_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/be_empty_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_equivalent_to_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_equivalent_to_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_equivalent_to_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/be_equivalent_to_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_false_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_false_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_false_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/be_false_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_identical_to.go b/vendor/github.com/onsi/gomega/matchers/be_identical_to.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_identical_to.go
rename to vendor/github.com/onsi/gomega/matchers/be_identical_to.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_nil_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_nil_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_nil_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/be_nil_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_numerically_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_numerically_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_numerically_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/be_numerically_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_sent_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_sent_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_sent_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/be_sent_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_temporally_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_temporally_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_temporally_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/be_temporally_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_true_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_true_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_true_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/be_true_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_zero_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_zero_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/be_zero_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/be_zero_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/consist_of.go b/vendor/github.com/onsi/gomega/matchers/consist_of.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/consist_of.go
rename to vendor/github.com/onsi/gomega/matchers/consist_of.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/contain_element_matcher.go b/vendor/github.com/onsi/gomega/matchers/contain_element_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/contain_element_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/contain_element_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/contain_substring_matcher.go b/vendor/github.com/onsi/gomega/matchers/contain_substring_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/contain_substring_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/contain_substring_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/equal_matcher.go b/vendor/github.com/onsi/gomega/matchers/equal_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/equal_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/equal_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/have_cap_matcher.go b/vendor/github.com/onsi/gomega/matchers/have_cap_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/have_cap_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/have_cap_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/have_key_matcher.go b/vendor/github.com/onsi/gomega/matchers/have_key_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/have_key_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/have_key_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/have_key_with_value_matcher.go b/vendor/github.com/onsi/gomega/matchers/have_key_with_value_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/have_key_with_value_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/have_key_with_value_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/have_len_matcher.go b/vendor/github.com/onsi/gomega/matchers/have_len_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/have_len_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/have_len_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/have_occurred_matcher.go b/vendor/github.com/onsi/gomega/matchers/have_occurred_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/have_occurred_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/have_occurred_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/have_prefix_matcher.go b/vendor/github.com/onsi/gomega/matchers/have_prefix_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/have_prefix_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/have_prefix_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/have_suffix_matcher.go b/vendor/github.com/onsi/gomega/matchers/have_suffix_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/have_suffix_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/have_suffix_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/match_error_matcher.go b/vendor/github.com/onsi/gomega/matchers/match_error_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/match_error_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/match_error_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/match_json_matcher.go b/vendor/github.com/onsi/gomega/matchers/match_json_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/match_json_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/match_json_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/match_regexp_matcher.go b/vendor/github.com/onsi/gomega/matchers/match_regexp_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/match_regexp_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/match_regexp_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/not.go b/vendor/github.com/onsi/gomega/matchers/not.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/not.go
rename to vendor/github.com/onsi/gomega/matchers/not.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/or.go b/vendor/github.com/onsi/gomega/matchers/or.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/or.go
rename to vendor/github.com/onsi/gomega/matchers/or.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/panic_matcher.go b/vendor/github.com/onsi/gomega/matchers/panic_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/panic_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/panic_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/receive_matcher.go b/vendor/github.com/onsi/gomega/matchers/receive_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/receive_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/receive_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/succeed_matcher.go b/vendor/github.com/onsi/gomega/matchers/succeed_matcher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/succeed_matcher.go
rename to vendor/github.com/onsi/gomega/matchers/succeed_matcher.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/support/goraph/MIT.LICENSE b/vendor/github.com/onsi/gomega/matchers/support/goraph/MIT.LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/support/goraph/MIT.LICENSE
rename to vendor/github.com/onsi/gomega/matchers/support/goraph/MIT.LICENSE
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraph.go b/vendor/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraph.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraph.go
rename to vendor/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraph.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraphmatching.go b/vendor/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraphmatching.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraphmatching.go
rename to vendor/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraphmatching.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/support/goraph/edge/edge.go b/vendor/github.com/onsi/gomega/matchers/support/goraph/edge/edge.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/support/goraph/edge/edge.go
rename to vendor/github.com/onsi/gomega/matchers/support/goraph/edge/edge.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/support/goraph/node/node.go b/vendor/github.com/onsi/gomega/matchers/support/goraph/node/node.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/support/goraph/node/node.go
rename to vendor/github.com/onsi/gomega/matchers/support/goraph/node/node.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/support/goraph/util/util.go b/vendor/github.com/onsi/gomega/matchers/support/goraph/util/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/support/goraph/util/util.go
rename to vendor/github.com/onsi/gomega/matchers/support/goraph/util/util.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/type_support.go b/vendor/github.com/onsi/gomega/matchers/type_support.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/type_support.go
rename to vendor/github.com/onsi/gomega/matchers/type_support.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/matchers/with_transform.go b/vendor/github.com/onsi/gomega/matchers/with_transform.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/matchers/with_transform.go
rename to vendor/github.com/onsi/gomega/matchers/with_transform.go
diff --git a/Godeps/_workspace/src/github.com/onsi/gomega/types/types.go b/vendor/github.com/onsi/gomega/types/types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/onsi/gomega/types/types.go
rename to vendor/github.com/onsi/gomega/types/types.go
diff --git a/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE
new file mode 100644
index 0000000000..f090cb42f3
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Simon Eskildsen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/codegangsta/cli/LICENSE b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/codegangsta/cli/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/codegangsta/cli/LICENSE
rename to vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/codegangsta/cli/LICENSE
diff --git a/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/coreos/go-systemd/LICENSE b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/coreos/go-systemd/LICENSE
new file mode 100644
index 0000000000..37ec93a14f
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/coreos/go-systemd/LICENSE
@@ -0,0 +1,191 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/LICENSE b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/LICENSE
new file mode 100644
index 0000000000..c7a3f0cfd4
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/LICENSE
@@ -0,0 +1,191 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2013-2015 Docker, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/NOTICE b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/NOTICE
new file mode 100644
index 0000000000..6e6f469ab9
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/NOTICE
@@ -0,0 +1,19 @@
+Docker
+Copyright 2012-2015 Docker, Inc.
+
+This product includes software developed at Docker, Inc. (https://www.docker.com).
+
+This product contains software (https://github.com/kr/pty) developed
+by Keith Rarick, licensed under the MIT License.
+
+The following is courtesy of our legal counsel:
+
+
+Use and transfer of Docker may be subject to certain restrictions by the
+United States and other governments.
+It is your responsibility to ensure that your use and/or transfer does not
+violate applicable laws.
+
+For more information, please see https://www.bis.doc.gov
+
+See also https://www.apache.org/dev/crypto.html and/or seek legal counsel.
diff --git a/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/contrib/syntax/vim/LICENSE b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/contrib/syntax/vim/LICENSE
new file mode 100644
index 0000000000..e67cdabd22
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/contrib/syntax/vim/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2013 Honza Pokorny
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/docs/project/images/red_notice.png b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/docs/project/images/red_notice.png
new file mode 100644
index 0000000000..8839723a37
Binary files /dev/null and b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/docs/project/images/red_notice.png differ
diff --git a/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/pkg/mflag/LICENSE b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/pkg/mflag/LICENSE
new file mode 100644
index 0000000000..ac74d8f049
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/pkg/mflag/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014-2015 The Docker & Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.APACHE b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.APACHE
new file mode 100644
index 0000000000..9e4bd4dbee
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.APACHE
@@ -0,0 +1,191 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2014-2015 Docker, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.BSD b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.BSD
new file mode 100644
index 0000000000..ac74d8f049
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.BSD
@@ -0,0 +1,27 @@
+Copyright (c) 2014-2015 The Docker & Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/go-units/LICENSE b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/go-units/LICENSE
new file mode 100644
index 0000000000..b55b37bc31
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/docker/go-units/LICENSE
@@ -0,0 +1,191 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2015 Docker, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/godbus/dbus/LICENSE b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/godbus/dbus/LICENSE
new file mode 100644
index 0000000000..670d88fcaa
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/godbus/dbus/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2013, Georg Reinke (<guelfey at gmail dot com>), Google
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/LICENSE b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE
similarity index 78%
rename from Godeps/_workspace/src/github.com/gorilla/context/LICENSE
rename to vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE
index 0e5fb87280..1b1b1921ef 100644
--- a/Godeps/_workspace/src/github.com/gorilla/context/LICENSE
+++ b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE
@@ -1,16 +1,19 @@
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
+Go support for Protocol Buffers - Google's data interchange format
+
+Copyright 2010 The Go Authors.  All rights reserved.
+https://github.com/golang/protobuf
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-	 * Redistributions of source code must retain the above copyright
+    * Redistributions of source code must retain the above copyright
 notice, this list of conditions and the following disclaimer.
-	 * Redistributions in binary form must reproduce the above
+    * Redistributions in binary form must reproduce the above
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-	 * Neither the name of Google Inc. nor the names of its
+    * Neither the name of Google Inc. nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
@@ -25,3 +28,4 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/opencontainers/specs/LICENSE b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/opencontainers/specs/LICENSE
new file mode 100644
index 0000000000..bdc403653e
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/opencontainers/specs/LICENSE
@@ -0,0 +1,191 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2015 The Linux Foundation.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/gorilla/handlers/LICENSE b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/LICENSE
similarity index 76%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/gorilla/handlers/LICENSE
rename to vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/LICENSE
index 66ea3c8ae7..81cf60de29 100644
--- a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/gorilla/handlers/LICENSE
+++ b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/LICENSE
@@ -1,12 +1,12 @@
-Copyright (c) 2013 The Gorilla Handlers Authors. All rights reserved.
+Copyright (c) 2015 Matthew Heon <mheon@redhat.com>
+Copyright (c) 2015 Paul Moore <pmoore@redhat.com>
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
-
-  Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-  Redistributions in binary form must reproduce the above copyright notice,
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
 
diff --git a/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE
new file mode 100644
index 0000000000..80dd96de77
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE
@@ -0,0 +1,24 @@
+Copyright 2013 Suryandaru Triandana <syndtr@gmail.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE
new file mode 100644
index 0000000000..9f64db8582
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE
@@ -0,0 +1,192 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2014 Vishvananda Ishaya.
+   Copyright 2014 Docker, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/docker/libtrust/LICENSE b/vendor/github.com/opencontainers/runc/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/docker/libtrust/LICENSE
rename to vendor/github.com/opencontainers/runc/LICENSE
diff --git a/vendor/github.com/opencontainers/runc/NOTICE b/vendor/github.com/opencontainers/runc/NOTICE
new file mode 100644
index 0000000000..5c97abce4b
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/NOTICE
@@ -0,0 +1,17 @@
+runc
+
+Copyright 2012-2015 Docker, Inc.
+
+This product includes software developed at Docker, Inc. (http://www.docker.com).
+
+The following is courtesy of our legal counsel:
+
+
+Use and transfer of Docker may be subject to certain restrictions by the
+United States and other governments.  
+It is your responsibility to ensure that your use and/or transfer does not
+violate applicable laws. 
+
+For more information, please see http://www.bis.doc.gov
+
+See also http://www.apache.org/dev/crypto.html and/or seek legal counsel.
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/README.md b/vendor/github.com/opencontainers/runc/libcontainer/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/README.md
rename to vendor/github.com/opencontainers/runc/libcontainer/README.md
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/SPEC.md b/vendor/github.com/opencontainers/runc/libcontainer/SPEC.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/SPEC.md
rename to vendor/github.com/opencontainers/runc/libcontainer/SPEC.md
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/apparmor/apparmor.go b/vendor/github.com/opencontainers/runc/libcontainer/apparmor/apparmor.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/apparmor/apparmor.go
rename to vendor/github.com/opencontainers/runc/libcontainer/apparmor/apparmor.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/apparmor/apparmor_disabled.go b/vendor/github.com/opencontainers/runc/libcontainer/apparmor/apparmor_disabled.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/apparmor/apparmor_disabled.go
rename to vendor/github.com/opencontainers/runc/libcontainer/apparmor/apparmor_disabled.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/capabilities_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/capabilities_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/capabilities_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/capabilities_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/cgroups.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/cgroups.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/cgroups.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/cgroups.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/cgroups_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/cgroups_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/cgroups_unsupported.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/cgroups_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/blkio.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/blkio.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/blkio.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/blkio.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpu.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpu.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpu.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpu.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuacct.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuacct.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuacct.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuacct.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuset.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuset.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuset.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuset.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/devices.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/devices.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/devices.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/devices.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/freezer.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/freezer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/freezer.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/freezer.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/fs_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/fs_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/fs_unsupported.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/fs_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/hugetlb.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/hugetlb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/hugetlb.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/hugetlb.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/memory.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/memory.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/memory.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/memory.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/name.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/name.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/name.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/name.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_cls.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_cls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_cls.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_cls.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_prio.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_prio.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_prio.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_prio.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/perf_event.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/perf_event.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/perf_event.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/perf_event.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/pids.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/pids.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/pids.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/pids.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/utils.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/utils.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/fs/utils.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/utils.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/stats.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/stats.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/stats.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/stats.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_nosystemd.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_nosystemd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_nosystemd.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_nosystemd.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/utils.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/cgroups/utils.go
rename to vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/compat_1.5_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/compat_1.5_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/compat_1.5_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/compat_1.5_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/blkio_device.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/blkio_device.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/blkio_device.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/blkio_device.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/cgroup_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/cgroup_unix.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_unix.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/cgroup_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/cgroup_unsupported.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/cgroup_windows.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/cgroup_windows.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_windows.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/config.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/config.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/config.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/config_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/config_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/config_unix.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/config_unix.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/device.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/device.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/device.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/device.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/device_defaults.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/device_defaults.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/device_defaults.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/device_defaults.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/hugepage_limit.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/hugepage_limit.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/hugepage_limit.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/hugepage_limit.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/interface_priority_map.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/interface_priority_map.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/interface_priority_map.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/interface_priority_map.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/mount.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/mount.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/mount.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/mount.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall_unsupported.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_unix.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_unix.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/namespaces_unsupported.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/network.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/network.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/network.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/network.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/validate/config.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/validate/config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/configs/validate/config.go
rename to vendor/github.com/opencontainers/runc/libcontainer/configs/validate/config.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console.go b/vendor/github.com/opencontainers/runc/libcontainer/console.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console.go
rename to vendor/github.com/opencontainers/runc/libcontainer/console.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console_freebsd.go b/vendor/github.com/opencontainers/runc/libcontainer/console_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console_freebsd.go
rename to vendor/github.com/opencontainers/runc/libcontainer/console_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/console_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/console_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console_windows.go b/vendor/github.com/opencontainers/runc/libcontainer/console_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/console_windows.go
rename to vendor/github.com/opencontainers/runc/libcontainer/console_windows.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container.go b/vendor/github.com/opencontainers/runc/libcontainer/container.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container.go
rename to vendor/github.com/opencontainers/runc/libcontainer/container.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/container_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/container_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_nouserns_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/container_nouserns_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_nouserns_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/container_nouserns_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_userns_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/container_userns_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_userns_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/container_userns_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_windows.go b/vendor/github.com/opencontainers/runc/libcontainer/container_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/container_windows.go
rename to vendor/github.com/opencontainers/runc/libcontainer/container_windows.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criu_opts_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/criu_opts_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criu_opts_unix.go
rename to vendor/github.com/opencontainers/runc/libcontainer/criu_opts_unix.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criu_opts_windows.go b/vendor/github.com/opencontainers/runc/libcontainer/criu_opts_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criu_opts_windows.go
rename to vendor/github.com/opencontainers/runc/libcontainer/criu_opts_windows.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criurpc/Makefile b/vendor/github.com/opencontainers/runc/libcontainer/criurpc/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criurpc/Makefile
rename to vendor/github.com/opencontainers/runc/libcontainer/criurpc/Makefile
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.pb.go b/vendor/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.pb.go
rename to vendor/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.pb.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.proto b/vendor/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.proto
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.proto
rename to vendor/github.com/opencontainers/runc/libcontainer/criurpc/criurpc.proto
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/devices/devices_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/devices/devices_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/devices/devices_unix.go
rename to vendor/github.com/opencontainers/runc/libcontainer/devices/devices_unix.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/devices/devices_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/devices/devices_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/devices/devices_unsupported.go
rename to vendor/github.com/opencontainers/runc/libcontainer/devices/devices_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/devices/number.go b/vendor/github.com/opencontainers/runc/libcontainer/devices/number.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/devices/number.go
rename to vendor/github.com/opencontainers/runc/libcontainer/devices/number.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/error.go b/vendor/github.com/opencontainers/runc/libcontainer/error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/error.go
rename to vendor/github.com/opencontainers/runc/libcontainer/error.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/factory.go b/vendor/github.com/opencontainers/runc/libcontainer/factory.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/factory.go
rename to vendor/github.com/opencontainers/runc/libcontainer/factory.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/factory_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/factory_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/factory_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/factory_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/generic_error.go b/vendor/github.com/opencontainers/runc/libcontainer/generic_error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/generic_error.go
rename to vendor/github.com/opencontainers/runc/libcontainer/generic_error.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/init_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/init_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/init_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/init_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/integration/doc.go b/vendor/github.com/opencontainers/runc/libcontainer/integration/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/integration/doc.go
rename to vendor/github.com/opencontainers/runc/libcontainer/integration/doc.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/label/label.go b/vendor/github.com/opencontainers/runc/libcontainer/label/label.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/label/label.go
rename to vendor/github.com/opencontainers/runc/libcontainer/label/label.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/label/label_selinux.go b/vendor/github.com/opencontainers/runc/libcontainer/label/label_selinux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/label/label_selinux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/label/label_selinux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/message_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/message_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/message_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/message_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/network_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/network_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/network_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/network_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/notify_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/notify_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/notify_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/notify_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/nsenter/README.md b/vendor/github.com/opencontainers/runc/libcontainer/nsenter/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/nsenter/README.md
rename to vendor/github.com/opencontainers/runc/libcontainer/nsenter/README.md
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/nsenter/nsenter.go b/vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsenter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/nsenter/nsenter.go
rename to vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsenter.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/nsenter/nsenter_gccgo.go b/vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsenter_gccgo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/nsenter/nsenter_gccgo.go
rename to vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsenter_gccgo.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/nsenter/nsenter_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsenter_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/nsenter/nsenter_unsupported.go
rename to vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsenter_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/nsenter/nsexec.c b/vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsexec.c
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/nsenter/nsexec.c
rename to vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsexec.c
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/process.go b/vendor/github.com/opencontainers/runc/libcontainer/process.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/process.go
rename to vendor/github.com/opencontainers/runc/libcontainer/process.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/process_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/process_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/process_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/process_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/restored_process.go b/vendor/github.com/opencontainers/runc/libcontainer/restored_process.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/restored_process.go
rename to vendor/github.com/opencontainers/runc/libcontainer/restored_process.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/rootfs_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/rootfs_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/rootfs_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/rootfs_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/config.go b/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/config.go
rename to vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/fixtures/proc_self_status b/vendor/github.com/opencontainers/runc/libcontainer/seccomp/fixtures/proc_self_status
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/fixtures/proc_self_status
rename to vendor/github.com/opencontainers/runc/libcontainer/seccomp/fixtures/proc_self_status
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_unsupported.go
rename to vendor/github.com/opencontainers/runc/libcontainer/seccomp/seccomp_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/selinux/selinux.go b/vendor/github.com/opencontainers/runc/libcontainer/selinux/selinux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/selinux/selinux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/selinux/selinux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/setgroups_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/setgroups_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/setgroups_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/setgroups_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/setns_init_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/setns_init_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/setns_init_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/setns_init_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stacktrace/capture.go b/vendor/github.com/opencontainers/runc/libcontainer/stacktrace/capture.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stacktrace/capture.go
rename to vendor/github.com/opencontainers/runc/libcontainer/stacktrace/capture.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stacktrace/frame.go b/vendor/github.com/opencontainers/runc/libcontainer/stacktrace/frame.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stacktrace/frame.go
rename to vendor/github.com/opencontainers/runc/libcontainer/stacktrace/frame.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stacktrace/stacktrace.go b/vendor/github.com/opencontainers/runc/libcontainer/stacktrace/stacktrace.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stacktrace/stacktrace.go
rename to vendor/github.com/opencontainers/runc/libcontainer/stacktrace/stacktrace.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/standard_init_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/standard_init_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/standard_init_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/standard_init_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/state_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/state_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/state_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/state_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats.go b/vendor/github.com/opencontainers/runc/libcontainer/stats.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats.go
rename to vendor/github.com/opencontainers/runc/libcontainer/stats.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats_freebsd.go b/vendor/github.com/opencontainers/runc/libcontainer/stats_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats_freebsd.go
rename to vendor/github.com/opencontainers/runc/libcontainer/stats_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/stats_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/stats_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats_windows.go b/vendor/github.com/opencontainers/runc/libcontainer/stats_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/stats_windows.go
rename to vendor/github.com/opencontainers/runc/libcontainer/stats_windows.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/linux.go b/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/system/linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/proc.go b/vendor/github.com/opencontainers/runc/libcontainer/system/proc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/proc.go
rename to vendor/github.com/opencontainers/runc/libcontainer/system/proc.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/setns_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/system/setns_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/setns_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/system/setns_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go b/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go
rename to vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go b/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go
rename to vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go b/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go
rename to vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/sysconfig.go b/vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/sysconfig.go
rename to vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go b/vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go
rename to vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS b/vendor/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS
rename to vendor/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup.go b/vendor/github.com/opencontainers/runc/libcontainer/user/lookup.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup.go
rename to vendor/github.com/opencontainers/runc/libcontainer/user/lookup.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go
rename to vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go
rename to vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/user.go b/vendor/github.com/opencontainers/runc/libcontainer/user/user.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/user.go
rename to vendor/github.com/opencontainers/runc/libcontainer/user/user.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/utils/utils.go b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/utils/utils.go
rename to vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go
rename to vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/xattr/errors.go b/vendor/github.com/opencontainers/runc/libcontainer/xattr/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/xattr/errors.go
rename to vendor/github.com/opencontainers/runc/libcontainer/xattr/errors.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/xattr/xattr_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/xattr/xattr_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/xattr/xattr_linux.go
rename to vendor/github.com/opencontainers/runc/libcontainer/xattr/xattr_linux.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/xattr/xattr_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/xattr/xattr_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/xattr/xattr_unsupported.go
rename to vendor/github.com/opencontainers/runc/libcontainer/xattr/xattr_unsupported.go
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/vendor/github.com/pborman/uuid/LICENSE b/vendor/github.com/pborman/uuid/LICENSE
new file mode 100644
index 0000000000..5dc68268d9
--- /dev/null
+++ b/vendor/github.com/pborman/uuid/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009,2014 Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
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/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/pmezard/go-difflib/LICENSE b/vendor/github.com/pmezard/go-difflib/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/pmezard/go-difflib/LICENSE
rename to vendor/github.com/pmezard/go-difflib/LICENSE
diff --git a/Godeps/_workspace/src/github.com/pmezard/go-difflib/difflib/difflib.go b/vendor/github.com/pmezard/go-difflib/difflib/difflib.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/pmezard/go-difflib/difflib/difflib.go
rename to vendor/github.com/pmezard/go-difflib/difflib/difflib.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/LICENSE b/vendor/github.com/prometheus/client_golang/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/LICENSE
rename to vendor/github.com/prometheus/client_golang/LICENSE
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/NOTICE b/vendor/github.com/prometheus/client_golang/NOTICE
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/NOTICE
rename to vendor/github.com/prometheus/client_golang/NOTICE
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/.gitignore b/vendor/github.com/prometheus/client_golang/prometheus/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/.gitignore
rename to vendor/github.com/prometheus/client_golang/prometheus/.gitignore
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/README.md b/vendor/github.com/prometheus/client_golang/prometheus/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/README.md
rename to vendor/github.com/prometheus/client_golang/prometheus/README.md
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/collector.go b/vendor/github.com/prometheus/client_golang/prometheus/collector.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/collector.go
rename to vendor/github.com/prometheus/client_golang/prometheus/collector.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/counter.go b/vendor/github.com/prometheus/client_golang/prometheus/counter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/counter.go
rename to vendor/github.com/prometheus/client_golang/prometheus/counter.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/desc.go b/vendor/github.com/prometheus/client_golang/prometheus/desc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/desc.go
rename to vendor/github.com/prometheus/client_golang/prometheus/desc.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/doc.go b/vendor/github.com/prometheus/client_golang/prometheus/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/doc.go
rename to vendor/github.com/prometheus/client_golang/prometheus/doc.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/expvar.go b/vendor/github.com/prometheus/client_golang/prometheus/expvar.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/expvar.go
rename to vendor/github.com/prometheus/client_golang/prometheus/expvar.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/gauge.go b/vendor/github.com/prometheus/client_golang/prometheus/gauge.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/gauge.go
rename to vendor/github.com/prometheus/client_golang/prometheus/gauge.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/go_collector.go b/vendor/github.com/prometheus/client_golang/prometheus/go_collector.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/go_collector.go
rename to vendor/github.com/prometheus/client_golang/prometheus/go_collector.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram.go b/vendor/github.com/prometheus/client_golang/prometheus/histogram.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram.go
rename to vendor/github.com/prometheus/client_golang/prometheus/histogram.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/http.go b/vendor/github.com/prometheus/client_golang/prometheus/http.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/http.go
rename to vendor/github.com/prometheus/client_golang/prometheus/http.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/metric.go b/vendor/github.com/prometheus/client_golang/prometheus/metric.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/metric.go
rename to vendor/github.com/prometheus/client_golang/prometheus/metric.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector.go b/vendor/github.com/prometheus/client_golang/prometheus/process_collector.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector.go
rename to vendor/github.com/prometheus/client_golang/prometheus/process_collector.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/push.go b/vendor/github.com/prometheus/client_golang/prometheus/push.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/push.go
rename to vendor/github.com/prometheus/client_golang/prometheus/push.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry.go b/vendor/github.com/prometheus/client_golang/prometheus/registry.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry.go
rename to vendor/github.com/prometheus/client_golang/prometheus/registry.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary.go b/vendor/github.com/prometheus/client_golang/prometheus/summary.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary.go
rename to vendor/github.com/prometheus/client_golang/prometheus/summary.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/untyped.go b/vendor/github.com/prometheus/client_golang/prometheus/untyped.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/untyped.go
rename to vendor/github.com/prometheus/client_golang/prometheus/untyped.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/value.go b/vendor/github.com/prometheus/client_golang/prometheus/value.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/value.go
rename to vendor/github.com/prometheus/client_golang/prometheus/value.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/vec.go b/vendor/github.com/prometheus/client_golang/prometheus/vec.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/vec.go
rename to vendor/github.com/prometheus/client_golang/prometheus/vec.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_model/LICENSE b/vendor/github.com/prometheus/client_model/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_model/LICENSE
rename to vendor/github.com/prometheus/client_model/LICENSE
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_model/NOTICE b/vendor/github.com/prometheus/client_model/NOTICE
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_model/NOTICE
rename to vendor/github.com/prometheus/client_model/NOTICE
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_model/go/metrics.pb.go b/vendor/github.com/prometheus/client_model/go/metrics.pb.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_model/go/metrics.pb.go
rename to vendor/github.com/prometheus/client_model/go/metrics.pb.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/bgentry/speakeasy/LICENSE_WINDOWS b/vendor/github.com/prometheus/client_model/ruby/LICENSE
similarity index 99%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/bgentry/speakeasy/LICENSE_WINDOWS
rename to vendor/github.com/prometheus/client_model/ruby/LICENSE
index ff177f6124..11069edd79 100644
--- a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/bgentry/speakeasy/LICENSE_WINDOWS
+++ b/vendor/github.com/prometheus/client_model/ruby/LICENSE
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright [2013] [the CloudFoundry Authors]
+Copyright [yyyy] [name of copyright owner]
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/decode.go b/vendor/github.com/prometheus/common/expfmt/decode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/decode.go
rename to vendor/github.com/prometheus/common/expfmt/decode.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/encode.go b/vendor/github.com/prometheus/common/expfmt/encode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/encode.go
rename to vendor/github.com/prometheus/common/expfmt/encode.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/expfmt.go b/vendor/github.com/prometheus/common/expfmt/expfmt.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/expfmt.go
rename to vendor/github.com/prometheus/common/expfmt/expfmt.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz.go b/vendor/github.com/prometheus/common/expfmt/fuzz.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz.go
rename to vendor/github.com/prometheus/common/expfmt/fuzz.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_0 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_0
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_0
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_0
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_1 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_1
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_1
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_1
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_2 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_2
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_2
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_2
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_3 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_3
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_3
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_3
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_4 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_4
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_4
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_4
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_0 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_0
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_0
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_0
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_1 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_1
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_1
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_1
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_10 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_10
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_10
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_10
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_11 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_11
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_11
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_11
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_12 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_12
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_12
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_12
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_13 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_13
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_13
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_13
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_14 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_14
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_14
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_14
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_15 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_15
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_15
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_15
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_16 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_16
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_16
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_16
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_17 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_17
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_17
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_17
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_18 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_18
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_18
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_18
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_19 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_19
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_19
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_19
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_2 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_2
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_2
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_2
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_3 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_3
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_3
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_3
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_4 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_4
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_4
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_4
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_5 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_5
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_5
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_5
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_6 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_6
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_6
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_6
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_7 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_7
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_7
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_7
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_8 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_8
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_8
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_8
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_9 b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_9
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_9
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_9
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/minimal b/vendor/github.com/prometheus/common/expfmt/fuzz/corpus/minimal
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/minimal
rename to vendor/github.com/prometheus/common/expfmt/fuzz/corpus/minimal
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/json_decode.go b/vendor/github.com/prometheus/common/expfmt/json_decode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/json_decode.go
rename to vendor/github.com/prometheus/common/expfmt/json_decode.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/text_create.go b/vendor/github.com/prometheus/common/expfmt/text_create.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/text_create.go
rename to vendor/github.com/prometheus/common/expfmt/text_create.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/text_parse.go b/vendor/github.com/prometheus/common/expfmt/text_parse.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/expfmt/text_parse.go
rename to vendor/github.com/prometheus/common/expfmt/text_parse.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/fingerprinting.go b/vendor/github.com/prometheus/common/model/fingerprinting.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/model/fingerprinting.go
rename to vendor/github.com/prometheus/common/model/fingerprinting.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/labels.go b/vendor/github.com/prometheus/common/model/labels.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/model/labels.go
rename to vendor/github.com/prometheus/common/model/labels.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/labelset.go b/vendor/github.com/prometheus/common/model/labelset.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/model/labelset.go
rename to vendor/github.com/prometheus/common/model/labelset.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/metric.go b/vendor/github.com/prometheus/common/model/metric.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/model/metric.go
rename to vendor/github.com/prometheus/common/model/metric.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/model.go b/vendor/github.com/prometheus/common/model/model.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/model/model.go
rename to vendor/github.com/prometheus/common/model/model.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/signature.go b/vendor/github.com/prometheus/common/model/signature.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/model/signature.go
rename to vendor/github.com/prometheus/common/model/signature.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/time.go b/vendor/github.com/prometheus/common/model/time.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/model/time.go
rename to vendor/github.com/prometheus/common/model/time.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/value.go b/vendor/github.com/prometheus/common/model/value.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/common/model/value.go
rename to vendor/github.com/prometheus/common/model/value.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/.travis.yml b/vendor/github.com/prometheus/procfs/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/.travis.yml
rename to vendor/github.com/prometheus/procfs/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/AUTHORS.md b/vendor/github.com/prometheus/procfs/AUTHORS.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/AUTHORS.md
rename to vendor/github.com/prometheus/procfs/AUTHORS.md
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/CONTRIBUTING.md b/vendor/github.com/prometheus/procfs/CONTRIBUTING.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/CONTRIBUTING.md
rename to vendor/github.com/prometheus/procfs/CONTRIBUTING.md
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/LICENSE b/vendor/github.com/prometheus/procfs/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/LICENSE
rename to vendor/github.com/prometheus/procfs/LICENSE
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/NOTICE b/vendor/github.com/prometheus/procfs/NOTICE
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/NOTICE
rename to vendor/github.com/prometheus/procfs/NOTICE
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/README.md b/vendor/github.com/prometheus/procfs/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/README.md
rename to vendor/github.com/prometheus/procfs/README.md
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/doc.go b/vendor/github.com/prometheus/procfs/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/doc.go
rename to vendor/github.com/prometheus/procfs/doc.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/cmdline b/vendor/github.com/prometheus/procfs/fixtures/26231/cmdline
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/cmdline
rename to vendor/github.com/prometheus/procfs/fixtures/26231/cmdline
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/0 b/vendor/github.com/prometheus/procfs/fixtures/26231/fd/0
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/0
rename to vendor/github.com/prometheus/procfs/fixtures/26231/fd/0
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/1 b/vendor/github.com/prometheus/procfs/fixtures/26231/fd/1
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/1
rename to vendor/github.com/prometheus/procfs/fixtures/26231/fd/1
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/2 b/vendor/github.com/prometheus/procfs/fixtures/26231/fd/2
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/2
rename to vendor/github.com/prometheus/procfs/fixtures/26231/fd/2
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/3 b/vendor/github.com/prometheus/procfs/fixtures/26231/fd/3
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/3
rename to vendor/github.com/prometheus/procfs/fixtures/26231/fd/3
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/4 b/vendor/github.com/prometheus/procfs/fixtures/26231/fd/4
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/4
rename to vendor/github.com/prometheus/procfs/fixtures/26231/fd/4
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/limits b/vendor/github.com/prometheus/procfs/fixtures/26231/limits
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/limits
rename to vendor/github.com/prometheus/procfs/fixtures/26231/limits
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/stat b/vendor/github.com/prometheus/procfs/fixtures/26231/stat
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/stat
rename to vendor/github.com/prometheus/procfs/fixtures/26231/stat
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/584/stat b/vendor/github.com/prometheus/procfs/fixtures/584/stat
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/584/stat
rename to vendor/github.com/prometheus/procfs/fixtures/584/stat
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/stat b/vendor/github.com/prometheus/procfs/fixtures/stat
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/stat
rename to vendor/github.com/prometheus/procfs/fixtures/stat
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fs.go b/vendor/github.com/prometheus/procfs/fs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/fs.go
rename to vendor/github.com/prometheus/procfs/fs.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/proc.go b/vendor/github.com/prometheus/procfs/proc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/proc.go
rename to vendor/github.com/prometheus/procfs/proc.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/proc_limits.go b/vendor/github.com/prometheus/procfs/proc_limits.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/proc_limits.go
rename to vendor/github.com/prometheus/procfs/proc_limits.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/proc_stat.go b/vendor/github.com/prometheus/procfs/proc_stat.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/proc_stat.go
rename to vendor/github.com/prometheus/procfs/proc_stat.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/stat.go b/vendor/github.com/prometheus/procfs/stat.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/procfs/stat.go
rename to vendor/github.com/prometheus/procfs/stat.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/.travis.yml b/vendor/github.com/rackspace/gophercloud/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/.travis.yml
rename to vendor/github.com/rackspace/gophercloud/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/CONTRIBUTING.md b/vendor/github.com/rackspace/gophercloud/CONTRIBUTING.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/CONTRIBUTING.md
rename to vendor/github.com/rackspace/gophercloud/CONTRIBUTING.md
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/CONTRIBUTORS.md b/vendor/github.com/rackspace/gophercloud/CONTRIBUTORS.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/CONTRIBUTORS.md
rename to vendor/github.com/rackspace/gophercloud/CONTRIBUTORS.md
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/LICENSE b/vendor/github.com/rackspace/gophercloud/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/LICENSE
rename to vendor/github.com/rackspace/gophercloud/LICENSE
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/README.md b/vendor/github.com/rackspace/gophercloud/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/README.md
rename to vendor/github.com/rackspace/gophercloud/README.md
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/UPGRADING.md b/vendor/github.com/rackspace/gophercloud/UPGRADING.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/UPGRADING.md
rename to vendor/github.com/rackspace/gophercloud/UPGRADING.md
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/README.md b/vendor/github.com/rackspace/gophercloud/acceptance/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/README.md
rename to vendor/github.com/rackspace/gophercloud/acceptance/README.md
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/blockstorage/v1/pkg.go b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/blockstorage/v1/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/blockstorage/v1/pkg.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/blockstorage/v1/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/compute/v2/pkg.go b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/compute/v2/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/compute/v2/pkg.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/compute/v2/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/db/v1/common.go b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/db/v1/common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/db/v1/common.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/db/v1/common.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/db/v1/pkg.go b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/db/v1/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/db/v1/pkg.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/db/v1/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/identity/v2/pkg.go b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/identity/v2/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/identity/v2/pkg.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/identity/v2/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/identity/v3/pkg.go b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/identity/v3/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/identity/v3/pkg.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/identity/v3/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/common.go b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/common.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/common.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/fwaas/pkg.go b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/fwaas/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/fwaas/pkg.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/fwaas/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/lbaas/common.go b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/lbaas/common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/lbaas/common.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/lbaas/common.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/lbaas/pkg.go b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/lbaas/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/lbaas/pkg.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/lbaas/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/pkg.go b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/pkg.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/extensions/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/pkg.go b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/pkg.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/networking/v2/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/objectstorage/v1/common.go b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/objectstorage/v1/common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/objectstorage/v1/common.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/objectstorage/v1/common.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/orchestration/v1/common.go b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/orchestration/v1/common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/orchestration/v1/common.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/orchestration/v1/common.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/orchestration/v1/hello-compute.json b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/orchestration/v1/hello-compute.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/orchestration/v1/hello-compute.json
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/orchestration/v1/hello-compute.json
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/pkg.go b/vendor/github.com/rackspace/gophercloud/acceptance/openstack/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/openstack/pkg.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/openstack/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/blockstorage/v1/common.go b/vendor/github.com/rackspace/gophercloud/acceptance/rackspace/blockstorage/v1/common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/blockstorage/v1/common.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/rackspace/blockstorage/v1/common.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/cdn/v1/common.go b/vendor/github.com/rackspace/gophercloud/acceptance/rackspace/cdn/v1/common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/cdn/v1/common.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/rackspace/cdn/v1/common.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/compute/v2/pkg.go b/vendor/github.com/rackspace/gophercloud/acceptance/rackspace/compute/v2/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/compute/v2/pkg.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/rackspace/compute/v2/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/db/v1/common.go b/vendor/github.com/rackspace/gophercloud/acceptance/rackspace/db/v1/common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/db/v1/common.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/rackspace/db/v1/common.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/db/v1/pkg.go b/vendor/github.com/rackspace/gophercloud/acceptance/rackspace/db/v1/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/db/v1/pkg.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/rackspace/db/v1/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/identity/v2/pkg.go b/vendor/github.com/rackspace/gophercloud/acceptance/rackspace/identity/v2/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/identity/v2/pkg.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/rackspace/identity/v2/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/lb/v1/common.go b/vendor/github.com/rackspace/gophercloud/acceptance/rackspace/lb/v1/common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/lb/v1/common.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/rackspace/lb/v1/common.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/networking/v2/common.go b/vendor/github.com/rackspace/gophercloud/acceptance/rackspace/networking/v2/common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/networking/v2/common.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/rackspace/networking/v2/common.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/objectstorage/v1/common.go b/vendor/github.com/rackspace/gophercloud/acceptance/rackspace/objectstorage/v1/common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/objectstorage/v1/common.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/rackspace/objectstorage/v1/common.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/orchestration/v1/common.go b/vendor/github.com/rackspace/gophercloud/acceptance/rackspace/orchestration/v1/common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/orchestration/v1/common.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/rackspace/orchestration/v1/common.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/pkg.go b/vendor/github.com/rackspace/gophercloud/acceptance/rackspace/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/pkg.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/rackspace/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/rackconnect/v3/common.go b/vendor/github.com/rackspace/gophercloud/acceptance/rackspace/rackconnect/v3/common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/rackspace/rackconnect/v3/common.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/rackspace/rackconnect/v3/common.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/tools/pkg.go b/vendor/github.com/rackspace/gophercloud/acceptance/tools/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/tools/pkg.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/tools/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/tools/tools.go b/vendor/github.com/rackspace/gophercloud/acceptance/tools/tools.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/acceptance/tools/tools.go
rename to vendor/github.com/rackspace/gophercloud/acceptance/tools/tools.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/auth_options.go b/vendor/github.com/rackspace/gophercloud/auth_options.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/auth_options.go
rename to vendor/github.com/rackspace/gophercloud/auth_options.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/auth_results.go b/vendor/github.com/rackspace/gophercloud/auth_results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/auth_results.go
rename to vendor/github.com/rackspace/gophercloud/auth_results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/doc.go b/vendor/github.com/rackspace/gophercloud/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/doc.go
rename to vendor/github.com/rackspace/gophercloud/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/endpoint_search.go b/vendor/github.com/rackspace/gophercloud/endpoint_search.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/endpoint_search.go
rename to vendor/github.com/rackspace/gophercloud/endpoint_search.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/auth_env.go b/vendor/github.com/rackspace/gophercloud/openstack/auth_env.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/auth_env.go
rename to vendor/github.com/rackspace/gophercloud/openstack/auth_env.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/results.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/apiversions/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/results.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/util.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/util.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots/util.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/results.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/testing/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/testing/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/testing/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/testing/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/testing/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/testing/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/testing/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/testing/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/util.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/util.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes/util.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/results.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumetypes/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/base/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/base/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/base/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/base/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/base/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/base/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/base/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/base/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/base/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/base/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/base/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/base/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/base/results.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/base/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/base/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/base/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/base/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/base/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/base/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/base/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/results.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/flavors/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/results.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/serviceassets/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/services/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/services/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/services/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/services/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/services/errors.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/services/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/services/errors.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/services/errors.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/services/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/services/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/services/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/services/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/services/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/services/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/services/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/services/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/services/results.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/services/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/services/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/services/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/services/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/services/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/cdn/v1/services/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/cdn/v1/services/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/client.go b/vendor/github.com/rackspace/gophercloud/openstack/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/client.go
rename to vendor/github.com/rackspace/gophercloud/openstack/client.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/common/README.md b/vendor/github.com/rackspace/gophercloud/openstack/common/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/common/README.md
rename to vendor/github.com/rackspace/gophercloud/openstack/common/README.md
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/common/extensions/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/common/extensions/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/common/extensions/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/common/extensions/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/common/extensions/errors.go b/vendor/github.com/rackspace/gophercloud/openstack/common/extensions/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/common/extensions/errors.go
rename to vendor/github.com/rackspace/gophercloud/openstack/common/extensions/errors.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/common/extensions/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/common/extensions/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/common/extensions/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/common/extensions/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/common/extensions/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/common/extensions/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/common/extensions/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/common/extensions/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/common/extensions/results.go b/vendor/github.com/rackspace/gophercloud/openstack/common/extensions/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/common/extensions/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/common/extensions/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/common/extensions/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/common/extensions/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/common/extensions/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/common/extensions/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume/results.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/results.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/defsecrules/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/delegate.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/delegate.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/diskconfig/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/diskconfig/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/diskconfig/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/diskconfig/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/diskconfig/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/diskconfig/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/diskconfig/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/diskconfig/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/diskconfig/results.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/diskconfig/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/diskconfig/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/diskconfig/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/results.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/results.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/results.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/networks/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/results.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/quotasets/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/schedulerhints/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/schedulerhints/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/schedulerhints/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/schedulerhints/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/schedulerhints/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/schedulerhints/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/schedulerhints/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/schedulerhints/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/results.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/secgroups/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/results.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/servergroups/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/startstop/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/startstop/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/startstop/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/startstop/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/startstop/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/startstop/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/startstop/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/startstop/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/startstop/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/startstop/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/startstop/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/startstop/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/results.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/tenantnetworks/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/results.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/testing/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/testing/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/testing/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/testing/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/testing/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/testing/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/testing/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/testing/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/results.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/flavors/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/images/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/images/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/images/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/images/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/images/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/images/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/images/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/images/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/images/results.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/images/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/images/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/images/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/images/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/images/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/images/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/images/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/servers/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/servers/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/servers/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/servers/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/servers/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/servers/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/servers/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/servers/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/servers/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/servers/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/servers/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/servers/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/servers/results.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/servers/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/servers/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/servers/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/servers/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/servers/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/servers/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/servers/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/servers/util.go b/vendor/github.com/rackspace/gophercloud/openstack/compute/v2/servers/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/compute/v2/servers/util.go
rename to vendor/github.com/rackspace/gophercloud/openstack/compute/v2/servers/util.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/configurations/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/configurations/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/configurations/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/configurations/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/configurations/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/configurations/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/configurations/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/configurations/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/configurations/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/configurations/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/configurations/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/configurations/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/configurations/results.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/configurations/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/configurations/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/configurations/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/configurations/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/configurations/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/configurations/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/configurations/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/databases/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/databases/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/databases/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/databases/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/databases/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/databases/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/databases/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/databases/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/databases/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/databases/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/databases/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/databases/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/databases/results.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/databases/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/databases/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/databases/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/databases/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/databases/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/databases/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/databases/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/datastores/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/datastores/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/datastores/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/datastores/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/datastores/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/datastores/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/datastores/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/datastores/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/datastores/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/datastores/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/datastores/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/datastores/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/datastores/results.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/datastores/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/datastores/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/datastores/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/datastores/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/datastores/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/datastores/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/datastores/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/flavors/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/flavors/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/flavors/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/flavors/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/flavors/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/flavors/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/flavors/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/flavors/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/flavors/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/flavors/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/flavors/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/flavors/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/flavors/results.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/flavors/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/flavors/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/flavors/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/flavors/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/flavors/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/flavors/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/flavors/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/instances/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/instances/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/instances/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/instances/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/instances/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/instances/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/instances/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/instances/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/instances/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/instances/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/instances/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/instances/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/instances/results.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/instances/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/instances/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/instances/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/instances/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/instances/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/instances/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/instances/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/users/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/users/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/users/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/users/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/users/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/users/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/users/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/users/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/users/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/users/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/users/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/users/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/users/results.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/users/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/users/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/users/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/users/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/db/v1/users/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/db/v1/users/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/db/v1/users/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/endpoint_location.go b/vendor/github.com/rackspace/gophercloud/openstack/endpoint_location.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/endpoint_location.go
rename to vendor/github.com/rackspace/gophercloud/openstack/endpoint_location.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/docs.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/docs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/docs.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/docs.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/results.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/admin/roles/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/delegate.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/delegate.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/extensions/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/results.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tenants/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/errors.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/errors.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/errors.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/results.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/tokens/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/users/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/users/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/users/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/users/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/users/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/users/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/users/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/users/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/users/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/users/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/users/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/users/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/users/results.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/users/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/users/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/users/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/users/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v2/users/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v2/users/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v2/users/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/errors.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/errors.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/errors.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/results.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/endpoints/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/roles/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/roles/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/roles/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/roles/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/roles/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/roles/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/roles/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/roles/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/roles/results.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/roles/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/roles/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/roles/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/roles/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/roles/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/roles/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/roles/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/services/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/services/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/services/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/services/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/services/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/services/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/services/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/services/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/services/results.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/services/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/services/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/services/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/services/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/services/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/services/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/services/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/errors.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/errors.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/errors.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/results.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/errors.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/errors.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/errors.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/apiversions/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/common/common_tests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/common/common_tests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/common/common_tests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/common/common_tests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/delegate.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/delegate.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/external/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/external/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/external/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/external/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/external/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/external/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/external/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/external/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/external/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/external/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/external/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/external/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/errors.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/errors.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/errors.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/policies/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/policies/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/policies/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/policies/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/policies/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/policies/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/policies/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/policies/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/policies/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/policies/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/policies/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/policies/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/errors.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/errors.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/errors.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/floatingips/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/routers/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/routers/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/routers/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/routers/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/routers/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/routers/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/routers/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/routers/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/routers/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/routers/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/routers/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/routers/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/members/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/members/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/members/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/members/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/members/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/members/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/members/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/members/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/members/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/members/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/members/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/members/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/monitors/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/monitors/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/monitors/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/monitors/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/monitors/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/monitors/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/monitors/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/monitors/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/monitors/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/monitors/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/monitors/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/monitors/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/pools/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/pools/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/pools/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/pools/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/pools/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/pools/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/pools/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/pools/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/pools/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/pools/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/pools/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/pools/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/provider/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/provider/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/provider/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/provider/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/provider/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/provider/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/provider/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/provider/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/groups/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/groups/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/groups/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/groups/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/groups/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/groups/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/groups/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/groups/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/groups/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/groups/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/groups/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/groups/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/rules/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/rules/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/rules/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/rules/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/rules/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/rules/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/rules/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/rules/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/rules/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/rules/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/rules/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/security/rules/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/networks/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/networks/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/networks/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/networks/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/networks/errors.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/networks/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/networks/errors.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/networks/errors.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/networks/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/networks/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/networks/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/networks/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/networks/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/networks/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/networks/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/networks/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/networks/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/networks/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/networks/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/networks/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/ports/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/ports/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/ports/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/ports/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/ports/errors.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/ports/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/ports/errors.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/ports/errors.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/ports/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/ports/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/ports/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/ports/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/ports/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/ports/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/ports/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/ports/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/ports/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/ports/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/ports/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/ports/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/errors.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/errors.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/errors.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/results.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/networking/v2/subnets/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/results.go b/vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/accounts/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/results.go b/vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/results.go b/vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/results.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/apiversions/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/results.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/buildinfo/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/results.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/results.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/environment.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/environment.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/environment.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/environment.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/results.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/template.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/template.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/template.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/template.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/utils.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/utils.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/utils.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks/utils.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/doc.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/doc.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/fixtures.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/requests.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/requests.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/results.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/results.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/urls.go b/vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/urls.go
rename to vendor/github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/utils/choose_version.go b/vendor/github.com/rackspace/gophercloud/openstack/utils/choose_version.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/openstack/utils/choose_version.go
rename to vendor/github.com/rackspace/gophercloud/openstack/utils/choose_version.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/pagination/http.go b/vendor/github.com/rackspace/gophercloud/pagination/http.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/pagination/http.go
rename to vendor/github.com/rackspace/gophercloud/pagination/http.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/pagination/linked.go b/vendor/github.com/rackspace/gophercloud/pagination/linked.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/pagination/linked.go
rename to vendor/github.com/rackspace/gophercloud/pagination/linked.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/pagination/marker.go b/vendor/github.com/rackspace/gophercloud/pagination/marker.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/pagination/marker.go
rename to vendor/github.com/rackspace/gophercloud/pagination/marker.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/pagination/null.go b/vendor/github.com/rackspace/gophercloud/pagination/null.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/pagination/null.go
rename to vendor/github.com/rackspace/gophercloud/pagination/null.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/pagination/pager.go b/vendor/github.com/rackspace/gophercloud/pagination/pager.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/pagination/pager.go
rename to vendor/github.com/rackspace/gophercloud/pagination/pager.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/pagination/pkg.go b/vendor/github.com/rackspace/gophercloud/pagination/pkg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/pagination/pkg.go
rename to vendor/github.com/rackspace/gophercloud/pagination/pkg.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/pagination/single.go b/vendor/github.com/rackspace/gophercloud/pagination/single.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/pagination/single.go
rename to vendor/github.com/rackspace/gophercloud/pagination/single.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/params.go b/vendor/github.com/rackspace/gophercloud/params.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/params.go
rename to vendor/github.com/rackspace/gophercloud/params.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/provider_client.go b/vendor/github.com/rackspace/gophercloud/provider_client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/provider_client.go
rename to vendor/github.com/rackspace/gophercloud/provider_client.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/auth_env.go b/vendor/github.com/rackspace/gophercloud/rackspace/auth_env.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/auth_env.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/auth_env.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/snapshots/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/snapshots/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/snapshots/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/snapshots/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/snapshots/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/snapshots/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/snapshots/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/snapshots/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/snapshots/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/snapshots/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/snapshots/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/snapshots/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumes/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumes/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumes/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumes/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumes/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumes/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumes/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumes/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumes/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumes/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumes/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumes/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumetypes/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumetypes/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumetypes/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumetypes/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumetypes/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumetypes/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumetypes/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumetypes/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumetypes/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumetypes/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumetypes/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumetypes/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/base/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/base/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/base/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/base/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/base/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/base/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/base/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/base/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/flavors/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/flavors/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/flavors/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/flavors/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/flavors/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/flavors/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/flavors/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/flavors/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/serviceassets/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/serviceassets/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/serviceassets/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/serviceassets/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/serviceassets/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/serviceassets/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/serviceassets/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/serviceassets/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/services/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/services/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/services/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/services/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/services/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/services/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/cdn/v1/services/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/cdn/v1/services/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/client.go b/vendor/github.com/rackspace/gophercloud/rackspace/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/client.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/client.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/bootfromvolume/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/bootfromvolume/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/bootfromvolume/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/bootfromvolume/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/flavors/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/images/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/images/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/images/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/images/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/images/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/images/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/images/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/images/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/images/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/images/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/images/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/images/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/keypairs/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/keypairs/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/keypairs/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/keypairs/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/keypairs/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/keypairs/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/keypairs/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/keypairs/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/networks/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/servers/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/virtualinterfaces/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/virtualinterfaces/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/virtualinterfaces/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/virtualinterfaces/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/virtualinterfaces/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/virtualinterfaces/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/virtualinterfaces/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/virtualinterfaces/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/virtualinterfaces/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/virtualinterfaces/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/virtualinterfaces/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/virtualinterfaces/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/volumeattach/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/volumeattach/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/volumeattach/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/volumeattach/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/volumeattach/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/volumeattach/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/compute/v2/volumeattach/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/compute/v2/volumeattach/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/backups/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/backups/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/backups/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/backups/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/backups/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/backups/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/backups/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/backups/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/backups/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/backups/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/backups/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/backups/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/backups/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/backups/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/backups/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/backups/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/backups/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/backups/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/backups/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/backups/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/configurations/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/configurations/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/configurations/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/configurations/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/configurations/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/configurations/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/configurations/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/configurations/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/configurations/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/configurations/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/configurations/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/configurations/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/databases/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/databases/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/databases/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/databases/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/databases/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/databases/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/databases/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/databases/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/databases/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/databases/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/databases/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/databases/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/datastores/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/datastores/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/datastores/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/datastores/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/datastores/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/datastores/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/datastores/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/datastores/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/flavors/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/flavors/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/flavors/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/flavors/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/flavors/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/flavors/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/flavors/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/flavors/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/instances/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/instances/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/instances/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/instances/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/instances/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/instances/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/instances/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/instances/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/instances/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/instances/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/instances/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/instances/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/instances/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/instances/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/instances/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/instances/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/instances/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/instances/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/instances/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/instances/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/instances/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/instances/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/instances/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/instances/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/users/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/users/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/users/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/users/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/users/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/users/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/users/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/users/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/users/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/users/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/users/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/users/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/users/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/users/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/users/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/users/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/users/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/users/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/users/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/users/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/users/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/db/v1/users/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/db/v1/users/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/db/v1/users/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/extensions/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/extensions/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/extensions/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/extensions/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/extensions/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/extensions/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/extensions/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/extensions/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/roles/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/roles/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/roles/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/roles/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/roles/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/roles/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/roles/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/roles/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/tenants/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/tenants/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/tenants/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/tenants/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/tenants/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/tenants/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/tenants/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/tenants/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/tokens/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/tokens/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/tokens/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/tokens/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/tokens/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/tokens/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/tokens/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/tokens/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/users/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/users/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/users/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/users/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/users/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/users/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/users/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/users/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/users/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/users/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/users/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/users/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/users/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/users/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/identity/v2/users/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/identity/v2/users/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/acl/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/lbs/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/monitors/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/nodes/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/sessions/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/ssl/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/throttle/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/lb/v1/vips/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/networking/v2/common/common_tests.go b/vendor/github.com/rackspace/gophercloud/rackspace/networking/v2/common/common_tests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/networking/v2/common/common_tests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/networking/v2/common/common_tests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/networking/v2/networks/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/networking/v2/networks/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/networking/v2/networks/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/networking/v2/networks/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/networking/v2/ports/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/networking/v2/ports/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/networking/v2/ports/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/networking/v2/ports/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/networking/v2/security/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/networking/v2/security/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/networking/v2/security/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/networking/v2/security/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/networking/v2/security/groups/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/networking/v2/security/groups/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/networking/v2/security/groups/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/networking/v2/security/groups/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/networking/v2/security/rules/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/networking/v2/security/rules/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/networking/v2/security/rules/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/networking/v2/security/rules/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/networking/v2/subnets/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/networking/v2/subnets/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/networking/v2/subnets/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/networking/v2/subnets/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/accounts/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/accounts/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/accounts/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/accounts/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/accounts/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/accounts/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/accounts/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/accounts/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/bulk/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdncontainers/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdnobjects/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdnobjects/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdnobjects/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdnobjects/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdnobjects/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdnobjects/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdnobjects/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdnobjects/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdnobjects/request.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdnobjects/request.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdnobjects/request.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/cdnobjects/request.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/containers/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/containers/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/containers/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/containers/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/containers/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/containers/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/containers/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/containers/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/objects/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/objects/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/objects/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/objects/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/objects/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/objects/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/objects/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/objectstorage/v1/objects/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/buildinfo/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/buildinfo/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/buildinfo/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/buildinfo/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/buildinfo/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/buildinfo/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/buildinfo/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/buildinfo/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackevents/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackevents/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackevents/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackevents/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackevents/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackevents/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackevents/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackevents/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackresources/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackresources/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackresources/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackresources/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackresources/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackresources/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackresources/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackresources/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks/fixtures.go b/vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks/fixtures.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks/fixtures.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks/fixtures.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacktemplates/delegate.go b/vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacktemplates/delegate.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacktemplates/delegate.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacktemplates/delegate.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacktemplates/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacktemplates/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacktemplates/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacktemplates/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/cloudnetworks/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/cloudnetworks/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/cloudnetworks/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/cloudnetworks/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/cloudnetworks/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/cloudnetworks/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/cloudnetworks/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/cloudnetworks/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/cloudnetworks/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/cloudnetworks/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/cloudnetworks/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/cloudnetworks/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/doc.go b/vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/doc.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/lbpools/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/publicips/requests.go b/vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/publicips/requests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/publicips/requests.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/publicips/requests.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/publicips/results.go b/vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/publicips/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/publicips/results.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/publicips/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/publicips/urls.go b/vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/publicips/urls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/publicips/urls.go
rename to vendor/github.com/rackspace/gophercloud/rackspace/rackconnect/v3/publicips/urls.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/results.go b/vendor/github.com/rackspace/gophercloud/results.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/results.go
rename to vendor/github.com/rackspace/gophercloud/results.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/script/acceptancetest b/vendor/github.com/rackspace/gophercloud/script/acceptancetest
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/script/acceptancetest
rename to vendor/github.com/rackspace/gophercloud/script/acceptancetest
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/script/bootstrap b/vendor/github.com/rackspace/gophercloud/script/bootstrap
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/script/bootstrap
rename to vendor/github.com/rackspace/gophercloud/script/bootstrap
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/script/cibuild b/vendor/github.com/rackspace/gophercloud/script/cibuild
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/script/cibuild
rename to vendor/github.com/rackspace/gophercloud/script/cibuild
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/script/test b/vendor/github.com/rackspace/gophercloud/script/test
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/script/test
rename to vendor/github.com/rackspace/gophercloud/script/test
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/script/unittest b/vendor/github.com/rackspace/gophercloud/script/unittest
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/script/unittest
rename to vendor/github.com/rackspace/gophercloud/script/unittest
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/service_client.go b/vendor/github.com/rackspace/gophercloud/service_client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/service_client.go
rename to vendor/github.com/rackspace/gophercloud/service_client.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/testhelper/client/fake.go b/vendor/github.com/rackspace/gophercloud/testhelper/client/fake.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/testhelper/client/fake.go
rename to vendor/github.com/rackspace/gophercloud/testhelper/client/fake.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/testhelper/convenience.go b/vendor/github.com/rackspace/gophercloud/testhelper/convenience.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/testhelper/convenience.go
rename to vendor/github.com/rackspace/gophercloud/testhelper/convenience.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/testhelper/doc.go b/vendor/github.com/rackspace/gophercloud/testhelper/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/testhelper/doc.go
rename to vendor/github.com/rackspace/gophercloud/testhelper/doc.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/testhelper/fixture/helper.go b/vendor/github.com/rackspace/gophercloud/testhelper/fixture/helper.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/testhelper/fixture/helper.go
rename to vendor/github.com/rackspace/gophercloud/testhelper/fixture/helper.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/testhelper/http_responses.go b/vendor/github.com/rackspace/gophercloud/testhelper/http_responses.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/testhelper/http_responses.go
rename to vendor/github.com/rackspace/gophercloud/testhelper/http_responses.go
diff --git a/Godeps/_workspace/src/github.com/rackspace/gophercloud/util.go b/vendor/github.com/rackspace/gophercloud/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/rackspace/gophercloud/util.go
rename to vendor/github.com/rackspace/gophercloud/util.go
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/.gitignore b/vendor/github.com/russross/blackfriday/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/.gitignore
rename to vendor/github.com/russross/blackfriday/.gitignore
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/.travis.yml b/vendor/github.com/russross/blackfriday/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/.travis.yml
rename to vendor/github.com/russross/blackfriday/.travis.yml
diff --git a/vendor/github.com/russross/blackfriday/LICENSE.txt b/vendor/github.com/russross/blackfriday/LICENSE.txt
new file mode 100644
index 0000000000..2885af3602
--- /dev/null
+++ b/vendor/github.com/russross/blackfriday/LICENSE.txt
@@ -0,0 +1,29 @@
+Blackfriday is distributed under the Simplified BSD License:
+
+> Copyright © 2011 Russ Ross
+> All rights reserved.
+>
+> Redistribution and use in source and binary forms, with or without
+> modification, are permitted provided that the following conditions
+> are met:
+>
+> 1.  Redistributions of source code must retain the above copyright
+>     notice, this list of conditions and the following disclaimer.
+>
+> 2.  Redistributions in binary form must reproduce the above
+>     copyright notice, this list of conditions and the following
+>     disclaimer in the documentation and/or other materials provided with
+>     the distribution.
+>
+> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+> "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+> LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+> FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+> COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+> INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+> BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+> LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+> ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+> POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/README.md b/vendor/github.com/russross/blackfriday/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/README.md
rename to vendor/github.com/russross/blackfriday/README.md
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/block.go b/vendor/github.com/russross/blackfriday/block.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/block.go
rename to vendor/github.com/russross/blackfriday/block.go
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/html.go b/vendor/github.com/russross/blackfriday/html.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/html.go
rename to vendor/github.com/russross/blackfriday/html.go
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/inline.go b/vendor/github.com/russross/blackfriday/inline.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/inline.go
rename to vendor/github.com/russross/blackfriday/inline.go
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/latex.go b/vendor/github.com/russross/blackfriday/latex.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/latex.go
rename to vendor/github.com/russross/blackfriday/latex.go
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/markdown.go b/vendor/github.com/russross/blackfriday/markdown.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/markdown.go
rename to vendor/github.com/russross/blackfriday/markdown.go
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/smartypants.go b/vendor/github.com/russross/blackfriday/smartypants.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/smartypants.go
rename to vendor/github.com/russross/blackfriday/smartypants.go
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Amps and angle encoding.html b/vendor/github.com/russross/blackfriday/upskirtref/Amps and angle encoding.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Amps and angle encoding.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Amps and angle encoding.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Amps and angle encoding.text b/vendor/github.com/russross/blackfriday/upskirtref/Amps and angle encoding.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Amps and angle encoding.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Amps and angle encoding.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Auto links.html b/vendor/github.com/russross/blackfriday/upskirtref/Auto links.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Auto links.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Auto links.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Auto links.text b/vendor/github.com/russross/blackfriday/upskirtref/Auto links.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Auto links.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Auto links.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Backslash escapes.html b/vendor/github.com/russross/blackfriday/upskirtref/Backslash escapes.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Backslash escapes.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Backslash escapes.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Backslash escapes.text b/vendor/github.com/russross/blackfriday/upskirtref/Backslash escapes.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Backslash escapes.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Backslash escapes.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Blockquotes with code blocks.html b/vendor/github.com/russross/blackfriday/upskirtref/Blockquotes with code blocks.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Blockquotes with code blocks.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Blockquotes with code blocks.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Blockquotes with code blocks.text b/vendor/github.com/russross/blackfriday/upskirtref/Blockquotes with code blocks.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Blockquotes with code blocks.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Blockquotes with code blocks.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Code Blocks.html b/vendor/github.com/russross/blackfriday/upskirtref/Code Blocks.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Code Blocks.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Code Blocks.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Code Blocks.text b/vendor/github.com/russross/blackfriday/upskirtref/Code Blocks.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Code Blocks.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Code Blocks.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Code Spans.html b/vendor/github.com/russross/blackfriday/upskirtref/Code Spans.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Code Spans.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Code Spans.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Code Spans.text b/vendor/github.com/russross/blackfriday/upskirtref/Code Spans.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Code Spans.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Code Spans.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines no empty line before block.html b/vendor/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines no empty line before block.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines no empty line before block.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines no empty line before block.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines no empty line before block.text b/vendor/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines no empty line before block.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines no empty line before block.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines no empty line before block.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines.html b/vendor/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines.text b/vendor/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Horizontal rules.html b/vendor/github.com/russross/blackfriday/upskirtref/Horizontal rules.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Horizontal rules.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Horizontal rules.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Horizontal rules.text b/vendor/github.com/russross/blackfriday/upskirtref/Horizontal rules.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Horizontal rules.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Horizontal rules.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Inline HTML (Advanced).html b/vendor/github.com/russross/blackfriday/upskirtref/Inline HTML (Advanced).html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Inline HTML (Advanced).html
rename to vendor/github.com/russross/blackfriday/upskirtref/Inline HTML (Advanced).html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Inline HTML (Advanced).text b/vendor/github.com/russross/blackfriday/upskirtref/Inline HTML (Advanced).text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Inline HTML (Advanced).text
rename to vendor/github.com/russross/blackfriday/upskirtref/Inline HTML (Advanced).text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Inline HTML (Simple).html b/vendor/github.com/russross/blackfriday/upskirtref/Inline HTML (Simple).html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Inline HTML (Simple).html
rename to vendor/github.com/russross/blackfriday/upskirtref/Inline HTML (Simple).html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Inline HTML (Simple).text b/vendor/github.com/russross/blackfriday/upskirtref/Inline HTML (Simple).text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Inline HTML (Simple).text
rename to vendor/github.com/russross/blackfriday/upskirtref/Inline HTML (Simple).text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Inline HTML comments.html b/vendor/github.com/russross/blackfriday/upskirtref/Inline HTML comments.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Inline HTML comments.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Inline HTML comments.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Inline HTML comments.text b/vendor/github.com/russross/blackfriday/upskirtref/Inline HTML comments.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Inline HTML comments.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Inline HTML comments.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Links, inline style.html b/vendor/github.com/russross/blackfriday/upskirtref/Links, inline style.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Links, inline style.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Links, inline style.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Links, inline style.text b/vendor/github.com/russross/blackfriday/upskirtref/Links, inline style.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Links, inline style.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Links, inline style.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Links, reference style.html b/vendor/github.com/russross/blackfriday/upskirtref/Links, reference style.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Links, reference style.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Links, reference style.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Links, reference style.text b/vendor/github.com/russross/blackfriday/upskirtref/Links, reference style.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Links, reference style.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Links, reference style.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Links, shortcut references.html b/vendor/github.com/russross/blackfriday/upskirtref/Links, shortcut references.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Links, shortcut references.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Links, shortcut references.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Links, shortcut references.text b/vendor/github.com/russross/blackfriday/upskirtref/Links, shortcut references.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Links, shortcut references.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Links, shortcut references.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Literal quotes in titles.html b/vendor/github.com/russross/blackfriday/upskirtref/Literal quotes in titles.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Literal quotes in titles.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Literal quotes in titles.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Literal quotes in titles.text b/vendor/github.com/russross/blackfriday/upskirtref/Literal quotes in titles.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Literal quotes in titles.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Literal quotes in titles.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Basics.html b/vendor/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Basics.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Basics.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Basics.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Basics.text b/vendor/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Basics.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Basics.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Basics.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Syntax.html b/vendor/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Syntax.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Syntax.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Syntax.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Syntax.text b/vendor/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Syntax.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Syntax.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Syntax.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Nested blockquotes.html b/vendor/github.com/russross/blackfriday/upskirtref/Nested blockquotes.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Nested blockquotes.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Nested blockquotes.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Nested blockquotes.text b/vendor/github.com/russross/blackfriday/upskirtref/Nested blockquotes.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Nested blockquotes.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Nested blockquotes.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Ordered and unordered lists.html b/vendor/github.com/russross/blackfriday/upskirtref/Ordered and unordered lists.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Ordered and unordered lists.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Ordered and unordered lists.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Ordered and unordered lists.text b/vendor/github.com/russross/blackfriday/upskirtref/Ordered and unordered lists.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Ordered and unordered lists.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Ordered and unordered lists.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Strong and em together.html b/vendor/github.com/russross/blackfriday/upskirtref/Strong and em together.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Strong and em together.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Strong and em together.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Strong and em together.text b/vendor/github.com/russross/blackfriday/upskirtref/Strong and em together.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Strong and em together.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Strong and em together.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Tabs.html b/vendor/github.com/russross/blackfriday/upskirtref/Tabs.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Tabs.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Tabs.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Tabs.text b/vendor/github.com/russross/blackfriday/upskirtref/Tabs.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Tabs.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Tabs.text
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Tidyness.html b/vendor/github.com/russross/blackfriday/upskirtref/Tidyness.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Tidyness.html
rename to vendor/github.com/russross/blackfriday/upskirtref/Tidyness.html
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Tidyness.text b/vendor/github.com/russross/blackfriday/upskirtref/Tidyness.text
similarity index 100%
rename from Godeps/_workspace/src/github.com/russross/blackfriday/upskirtref/Tidyness.text
rename to vendor/github.com/russross/blackfriday/upskirtref/Tidyness.text
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/LICENSE b/vendor/github.com/samuel/go-zookeeper/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/samuel/go-zookeeper/LICENSE
rename to vendor/github.com/samuel/go-zookeeper/LICENSE
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/conn.go b/vendor/github.com/samuel/go-zookeeper/zk/conn.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/conn.go
rename to vendor/github.com/samuel/go-zookeeper/zk/conn.go
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/constants.go b/vendor/github.com/samuel/go-zookeeper/zk/constants.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/constants.go
rename to vendor/github.com/samuel/go-zookeeper/zk/constants.go
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/flw.go b/vendor/github.com/samuel/go-zookeeper/zk/flw.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/flw.go
rename to vendor/github.com/samuel/go-zookeeper/zk/flw.go
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/lock.go b/vendor/github.com/samuel/go-zookeeper/zk/lock.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/lock.go
rename to vendor/github.com/samuel/go-zookeeper/zk/lock.go
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/server_help.go b/vendor/github.com/samuel/go-zookeeper/zk/server_help.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/server_help.go
rename to vendor/github.com/samuel/go-zookeeper/zk/server_help.go
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/server_java.go b/vendor/github.com/samuel/go-zookeeper/zk/server_java.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/server_java.go
rename to vendor/github.com/samuel/go-zookeeper/zk/server_java.go
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/structs.go b/vendor/github.com/samuel/go-zookeeper/zk/structs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/structs.go
rename to vendor/github.com/samuel/go-zookeeper/zk/structs.go
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/tracer.go b/vendor/github.com/samuel/go-zookeeper/zk/tracer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/tracer.go
rename to vendor/github.com/samuel/go-zookeeper/zk/tracer.go
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/util.go b/vendor/github.com/samuel/go-zookeeper/zk/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/util.go
rename to vendor/github.com/samuel/go-zookeeper/zk/util.go
diff --git a/vendor/github.com/seccomp/libseccomp-golang/LICENSE b/vendor/github.com/seccomp/libseccomp-golang/LICENSE
new file mode 100644
index 0000000000..81cf60de29
--- /dev/null
+++ b/vendor/github.com/seccomp/libseccomp-golang/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2015 Matthew Heon <mheon@redhat.com>
+Copyright (c) 2015 Paul Moore <pmoore@redhat.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/README b/vendor/github.com/seccomp/libseccomp-golang/README
similarity index 100%
rename from Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/README
rename to vendor/github.com/seccomp/libseccomp-golang/README
diff --git a/Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/seccomp.go b/vendor/github.com/seccomp/libseccomp-golang/seccomp.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/seccomp.go
rename to vendor/github.com/seccomp/libseccomp-golang/seccomp.go
diff --git a/Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/seccomp_internal.go b/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/seccomp_internal.go
rename to vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go
diff --git a/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/.travis.yml b/vendor/github.com/shurcooL/sanitized_anchor_name/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/.travis.yml
rename to vendor/github.com/shurcooL/sanitized_anchor_name/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/README.md b/vendor/github.com/shurcooL/sanitized_anchor_name/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/README.md
rename to vendor/github.com/shurcooL/sanitized_anchor_name/README.md
diff --git a/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/main.go b/vendor/github.com/shurcooL/sanitized_anchor_name/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/main.go
rename to vendor/github.com/shurcooL/sanitized_anchor_name/main.go
diff --git a/Godeps/_workspace/src/github.com/skynetservices/skydns/LICENSE b/vendor/github.com/skynetservices/skydns/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/skynetservices/skydns/LICENSE
rename to vendor/github.com/skynetservices/skydns/LICENSE
diff --git a/Godeps/_workspace/src/github.com/skynetservices/skydns/msg/service.go b/vendor/github.com/skynetservices/skydns/msg/service.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/skynetservices/skydns/msg/service.go
rename to vendor/github.com/skynetservices/skydns/msg/service.go
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/.gitignore b/vendor/github.com/spf13/cobra/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/.gitignore
rename to vendor/github.com/spf13/cobra/.gitignore
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/.mailmap b/vendor/github.com/spf13/cobra/.mailmap
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/.mailmap
rename to vendor/github.com/spf13/cobra/.mailmap
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/.travis.yml b/vendor/github.com/spf13/cobra/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/.travis.yml
rename to vendor/github.com/spf13/cobra/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/spf13/cobra/LICENSE.txt b/vendor/github.com/spf13/cobra/LICENSE.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/spf13/cobra/LICENSE.txt
rename to vendor/github.com/spf13/cobra/LICENSE.txt
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/README.md b/vendor/github.com/spf13/cobra/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/README.md
rename to vendor/github.com/spf13/cobra/README.md
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.go b/vendor/github.com/spf13/cobra/bash_completions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.go
rename to vendor/github.com/spf13/cobra/bash_completions.go
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.md b/vendor/github.com/spf13/cobra/bash_completions.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.md
rename to vendor/github.com/spf13/cobra/bash_completions.md
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra.go b/vendor/github.com/spf13/cobra/cobra.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/cobra.go
rename to vendor/github.com/spf13/cobra/cobra.go
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/add.go b/vendor/github.com/spf13/cobra/cobra/cmd/add.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/add.go
rename to vendor/github.com/spf13/cobra/cobra/cmd/add.go
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/helpers.go b/vendor/github.com/spf13/cobra/cobra/cmd/helpers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/helpers.go
rename to vendor/github.com/spf13/cobra/cobra/cmd/helpers.go
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/init.go b/vendor/github.com/spf13/cobra/cobra/cmd/init.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/init.go
rename to vendor/github.com/spf13/cobra/cobra/cmd/init.go
diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/licenses.go b/vendor/github.com/spf13/cobra/cobra/cmd/licenses.go
new file mode 100644
index 0000000000..5ad9c96ef1
--- /dev/null
+++ b/vendor/github.com/spf13/cobra/cobra/cmd/licenses.go
@@ -0,0 +1,1133 @@
+// Copyright © 2015 Steve Francia <spf@spf13.com>.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Parts inspired by https://github.com/ryanuber/go-license
+
+package cmd
+
+import "strings"
+
+//Licenses contains all possible licenses a user can chose from
+var Licenses map[string]License
+
+//License represents a software license agreement, containing the Name of
+// the license, its possible matches (on the command line as given to cobra)
+// the header to be used with each file on the file's creating, and the text
+// of the license
+type License struct {
+	Name            string   // The type of license in use
+	PossibleMatches []string // Similar names to guess
+	Text            string   // License text data
+	Header          string   // License header for source files
+}
+
+// given a license name (in), try to match the license indicated
+func matchLicense(in string) string {
+	for key, lic := range Licenses {
+		for _, match := range lic.PossibleMatches {
+			if strings.EqualFold(in, match) {
+				return key
+			}
+		}
+	}
+	return ""
+}
+
+func init() {
+	Licenses = make(map[string]License)
+
+	Licenses["apache"] = License{
+		Name:            "Apache 2.0",
+		PossibleMatches: []string{"apache", "apache20", "apache 2.0", "apache2.0", "apache-2.0"},
+		Header: `
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.`,
+		Text: `
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+`,
+	}
+
+	Licenses["mit"] = License{
+		Name:            "Mit",
+		PossibleMatches: []string{"mit"},
+		Header: `
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.`,
+		Text: `The MIT License (MIT)
+
+{{ .copyright }}
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+`,
+	}
+
+	Licenses["bsd"] = License{
+		Name:            "NewBSD",
+		PossibleMatches: []string{"bsd", "newbsd", "3 clause bsd"},
+		Header: `
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.`,
+		Text: `{{ .copyright }}
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+`,
+	}
+
+	Licenses["freebsd"] = License{
+		Name:            "Simplified BSD License",
+		PossibleMatches: []string{"freebsd", "simpbsd", "simple bsd", "2 clause bsd"},
+		Header: `
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.`,
+		Text: `{{ .copyright }}
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+`,
+	}
+
+	Licenses["gpl3"] = License{
+		Name:            "GNU General Public License 3.0",
+		PossibleMatches: []string{"gpl3", "gpl", "gnu gpl3", "gnu gpl"},
+		Header: `{{ .copyright }}
+
+ This file is part of {{ .appName }}.
+
+ {{ .appName }} is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ {{ .appName }} is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with {{ .appName }}. If not, see <http://www.gnu.org/licenses/>.
+	   `,
+		Text: `                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type 'show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type 'show c' for details.
+
+The hypothetical commands 'show w' and 'show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+`,
+	}
+
+	// Licenses["apache20"] = License{
+	// 	Name:            "Apache 2.0",
+	// 	PossibleMatches: []string{"apache", "apache20", ""},
+	//   Header: `
+	//   `,
+	// 	Text: `
+	//   `,
+	// }
+}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/root.go b/vendor/github.com/spf13/cobra/cobra/cmd/root.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/root.go
rename to vendor/github.com/spf13/cobra/cobra/cmd/root.go
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/main.go b/vendor/github.com/spf13/cobra/cobra/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/cobra/main.go
rename to vendor/github.com/spf13/cobra/cobra/main.go
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/command.go b/vendor/github.com/spf13/cobra/command.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/command.go
rename to vendor/github.com/spf13/cobra/command.go
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/command_notwin.go b/vendor/github.com/spf13/cobra/command_notwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/command_notwin.go
rename to vendor/github.com/spf13/cobra/command_notwin.go
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/command_win.go b/vendor/github.com/spf13/cobra/command_win.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/command_win.go
rename to vendor/github.com/spf13/cobra/command_win.go
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.go b/vendor/github.com/spf13/cobra/doc/man_docs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.go
rename to vendor/github.com/spf13/cobra/doc/man_docs.go
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.md b/vendor/github.com/spf13/cobra/doc/man_docs.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.md
rename to vendor/github.com/spf13/cobra/doc/man_docs.md
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.go b/vendor/github.com/spf13/cobra/doc/md_docs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.go
rename to vendor/github.com/spf13/cobra/doc/md_docs.go
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.md b/vendor/github.com/spf13/cobra/doc/md_docs.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.md
rename to vendor/github.com/spf13/cobra/doc/md_docs.md
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc/util.go b/vendor/github.com/spf13/cobra/doc/util.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/cobra/doc/util.go
rename to vendor/github.com/spf13/cobra/doc/util.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/.travis.yml b/vendor/github.com/spf13/pflag/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/.travis.yml
rename to vendor/github.com/spf13/pflag/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE b/vendor/github.com/spf13/pflag/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/LICENSE
rename to vendor/github.com/spf13/pflag/LICENSE
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/README.md b/vendor/github.com/spf13/pflag/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/README.md
rename to vendor/github.com/spf13/pflag/README.md
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/bool.go b/vendor/github.com/spf13/pflag/bool.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/bool.go
rename to vendor/github.com/spf13/pflag/bool.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/count.go b/vendor/github.com/spf13/pflag/count.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/count.go
rename to vendor/github.com/spf13/pflag/count.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/duration.go b/vendor/github.com/spf13/pflag/duration.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/duration.go
rename to vendor/github.com/spf13/pflag/duration.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/flag.go b/vendor/github.com/spf13/pflag/flag.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/flag.go
rename to vendor/github.com/spf13/pflag/flag.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/float32.go b/vendor/github.com/spf13/pflag/float32.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/float32.go
rename to vendor/github.com/spf13/pflag/float32.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/float64.go b/vendor/github.com/spf13/pflag/float64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/float64.go
rename to vendor/github.com/spf13/pflag/float64.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/golangflag.go b/vendor/github.com/spf13/pflag/golangflag.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/golangflag.go
rename to vendor/github.com/spf13/pflag/golangflag.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int.go b/vendor/github.com/spf13/pflag/int.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/int.go
rename to vendor/github.com/spf13/pflag/int.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int32.go b/vendor/github.com/spf13/pflag/int32.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/int32.go
rename to vendor/github.com/spf13/pflag/int32.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int64.go b/vendor/github.com/spf13/pflag/int64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/int64.go
rename to vendor/github.com/spf13/pflag/int64.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int8.go b/vendor/github.com/spf13/pflag/int8.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/int8.go
rename to vendor/github.com/spf13/pflag/int8.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int_slice.go b/vendor/github.com/spf13/pflag/int_slice.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/int_slice.go
rename to vendor/github.com/spf13/pflag/int_slice.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/ip.go b/vendor/github.com/spf13/pflag/ip.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/ip.go
rename to vendor/github.com/spf13/pflag/ip.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go b/vendor/github.com/spf13/pflag/ipmask.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go
rename to vendor/github.com/spf13/pflag/ipmask.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/ipnet.go b/vendor/github.com/spf13/pflag/ipnet.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/ipnet.go
rename to vendor/github.com/spf13/pflag/ipnet.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/string.go b/vendor/github.com/spf13/pflag/string.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/string.go
rename to vendor/github.com/spf13/pflag/string.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/string_slice.go b/vendor/github.com/spf13/pflag/string_slice.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/string_slice.go
rename to vendor/github.com/spf13/pflag/string_slice.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint.go b/vendor/github.com/spf13/pflag/uint.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/uint.go
rename to vendor/github.com/spf13/pflag/uint.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint16.go b/vendor/github.com/spf13/pflag/uint16.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/uint16.go
rename to vendor/github.com/spf13/pflag/uint16.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint32.go b/vendor/github.com/spf13/pflag/uint32.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/uint32.go
rename to vendor/github.com/spf13/pflag/uint32.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint64.go b/vendor/github.com/spf13/pflag/uint64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/uint64.go
rename to vendor/github.com/spf13/pflag/uint64.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint8.go b/vendor/github.com/spf13/pflag/uint8.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/uint8.go
rename to vendor/github.com/spf13/pflag/uint8.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/verify/all.sh b/vendor/github.com/spf13/pflag/verify/all.sh
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/verify/all.sh
rename to vendor/github.com/spf13/pflag/verify/all.sh
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/verify/gofmt.sh b/vendor/github.com/spf13/pflag/verify/gofmt.sh
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/verify/gofmt.sh
rename to vendor/github.com/spf13/pflag/verify/gofmt.sh
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/verify/golint.sh b/vendor/github.com/spf13/pflag/verify/golint.sh
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/verify/golint.sh
rename to vendor/github.com/spf13/pflag/verify/golint.sh
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/.gitignore b/vendor/github.com/stretchr/objx/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/.gitignore
rename to vendor/github.com/stretchr/objx/.gitignore
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/README.md b/vendor/github.com/stretchr/objx/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/README.md
rename to vendor/github.com/stretchr/objx/README.md
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/accessors.go b/vendor/github.com/stretchr/objx/accessors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/accessors.go
rename to vendor/github.com/stretchr/objx/accessors.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/array-access.txt b/vendor/github.com/stretchr/objx/codegen/array-access.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/codegen/array-access.txt
rename to vendor/github.com/stretchr/objx/codegen/array-access.txt
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/index.html b/vendor/github.com/stretchr/objx/codegen/index.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/codegen/index.html
rename to vendor/github.com/stretchr/objx/codegen/index.html
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/template.txt b/vendor/github.com/stretchr/objx/codegen/template.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/codegen/template.txt
rename to vendor/github.com/stretchr/objx/codegen/template.txt
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/types_list.txt b/vendor/github.com/stretchr/objx/codegen/types_list.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/codegen/types_list.txt
rename to vendor/github.com/stretchr/objx/codegen/types_list.txt
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/constants.go b/vendor/github.com/stretchr/objx/constants.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/constants.go
rename to vendor/github.com/stretchr/objx/constants.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/conversions.go b/vendor/github.com/stretchr/objx/conversions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/conversions.go
rename to vendor/github.com/stretchr/objx/conversions.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/doc.go b/vendor/github.com/stretchr/objx/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/doc.go
rename to vendor/github.com/stretchr/objx/doc.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/map.go b/vendor/github.com/stretchr/objx/map.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/map.go
rename to vendor/github.com/stretchr/objx/map.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/mutations.go b/vendor/github.com/stretchr/objx/mutations.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/mutations.go
rename to vendor/github.com/stretchr/objx/mutations.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/security.go b/vendor/github.com/stretchr/objx/security.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/security.go
rename to vendor/github.com/stretchr/objx/security.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/tests.go b/vendor/github.com/stretchr/objx/tests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/tests.go
rename to vendor/github.com/stretchr/objx/tests.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen.go b/vendor/github.com/stretchr/objx/type_specific_codegen.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen.go
rename to vendor/github.com/stretchr/objx/type_specific_codegen.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/value.go b/vendor/github.com/stretchr/objx/value.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/value.go
rename to vendor/github.com/stretchr/objx/value.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/LICENCE.txt b/vendor/github.com/stretchr/testify/LICENCE.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/LICENCE.txt
rename to vendor/github.com/stretchr/testify/LICENCE.txt
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/LICENSE b/vendor/github.com/stretchr/testify/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/LICENSE
rename to vendor/github.com/stretchr/testify/LICENSE
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go b/vendor/github.com/stretchr/testify/assert/assertions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go
rename to vendor/github.com/stretchr/testify/assert/assertions.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go b/vendor/github.com/stretchr/testify/assert/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go
rename to vendor/github.com/stretchr/testify/assert/doc.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go b/vendor/github.com/stretchr/testify/assert/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go
rename to vendor/github.com/stretchr/testify/assert/errors.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/forward_assertions.go b/vendor/github.com/stretchr/testify/assert/forward_assertions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/assert/forward_assertions.go
rename to vendor/github.com/stretchr/testify/assert/forward_assertions.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/http_assertions.go b/vendor/github.com/stretchr/testify/assert/http_assertions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/assert/http_assertions.go
rename to vendor/github.com/stretchr/testify/assert/http_assertions.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go b/vendor/github.com/stretchr/testify/mock/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go
rename to vendor/github.com/stretchr/testify/mock/doc.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go b/vendor/github.com/stretchr/testify/mock/mock.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go
rename to vendor/github.com/stretchr/testify/mock/mock.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/require/doc.go b/vendor/github.com/stretchr/testify/require/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/require/doc.go
rename to vendor/github.com/stretchr/testify/require/doc.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/require/forward_requirements.go b/vendor/github.com/stretchr/testify/require/forward_requirements.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/require/forward_requirements.go
rename to vendor/github.com/stretchr/testify/require/forward_requirements.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/require/requirements.go b/vendor/github.com/stretchr/testify/require/requirements.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/require/requirements.go
rename to vendor/github.com/stretchr/testify/require/requirements.go
diff --git a/vendor/github.com/syndtr/gocapability/LICENSE b/vendor/github.com/syndtr/gocapability/LICENSE
new file mode 100644
index 0000000000..80dd96de77
--- /dev/null
+++ b/vendor/github.com/syndtr/gocapability/LICENSE
@@ -0,0 +1,24 @@
+Copyright 2013 Suryandaru Triandana <syndtr@gmail.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability.go b/vendor/github.com/syndtr/gocapability/capability/capability.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability.go
rename to vendor/github.com/syndtr/gocapability/capability/capability.go
diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_linux.go b/vendor/github.com/syndtr/gocapability/capability/capability_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_linux.go
rename to vendor/github.com/syndtr/gocapability/capability/capability_linux.go
diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_noop.go b/vendor/github.com/syndtr/gocapability/capability/capability_noop.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_noop.go
rename to vendor/github.com/syndtr/gocapability/capability/capability_noop.go
diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/enum.go b/vendor/github.com/syndtr/gocapability/capability/enum.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/syndtr/gocapability/capability/enum.go
rename to vendor/github.com/syndtr/gocapability/capability/enum.go
diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/enum_gen.go b/vendor/github.com/syndtr/gocapability/capability/enum_gen.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/syndtr/gocapability/capability/enum_gen.go
rename to vendor/github.com/syndtr/gocapability/capability/enum_gen.go
diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/enumgen/gen.go b/vendor/github.com/syndtr/gocapability/capability/enumgen/gen.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/syndtr/gocapability/capability/enumgen/gen.go
rename to vendor/github.com/syndtr/gocapability/capability/enumgen/gen.go
diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/syscall_linux.go b/vendor/github.com/syndtr/gocapability/capability/syscall_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/syndtr/gocapability/capability/syscall_linux.go
rename to vendor/github.com/syndtr/gocapability/capability/syscall_linux.go
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/ugorji/go/LICENSE b/vendor/github.com/ugorji/go/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/ugorji/go/LICENSE
rename to vendor/github.com/ugorji/go/LICENSE
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/0doc.go b/vendor/github.com/ugorji/go/codec/0doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/0doc.go
rename to vendor/github.com/ugorji/go/codec/0doc.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/README.md b/vendor/github.com/ugorji/go/codec/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/README.md
rename to vendor/github.com/ugorji/go/codec/README.md
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/binc.go b/vendor/github.com/ugorji/go/codec/binc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/binc.go
rename to vendor/github.com/ugorji/go/codec/binc.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/cbor.go b/vendor/github.com/ugorji/go/codec/cbor.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/cbor.go
rename to vendor/github.com/ugorji/go/codec/cbor.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/codecgen/README.md b/vendor/github.com/ugorji/go/codec/codecgen/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/codecgen/README.md
rename to vendor/github.com/ugorji/go/codec/codecgen/README.md
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/codecgen/gen.go b/vendor/github.com/ugorji/go/codec/codecgen/gen.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/codecgen/gen.go
rename to vendor/github.com/ugorji/go/codec/codecgen/gen.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/codecgen/z.go b/vendor/github.com/ugorji/go/codec/codecgen/z.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/codecgen/z.go
rename to vendor/github.com/ugorji/go/codec/codecgen/z.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/decode.go b/vendor/github.com/ugorji/go/codec/decode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/decode.go
rename to vendor/github.com/ugorji/go/codec/decode.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/encode.go b/vendor/github.com/ugorji/go/codec/encode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/encode.go
rename to vendor/github.com/ugorji/go/codec/encode.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/fast-path.generated.go b/vendor/github.com/ugorji/go/codec/fast-path.generated.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/fast-path.generated.go
rename to vendor/github.com/ugorji/go/codec/fast-path.generated.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/fast-path.go.tmpl b/vendor/github.com/ugorji/go/codec/fast-path.go.tmpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/fast-path.go.tmpl
rename to vendor/github.com/ugorji/go/codec/fast-path.go.tmpl
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/fast-path.not.go b/vendor/github.com/ugorji/go/codec/fast-path.not.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/fast-path.not.go
rename to vendor/github.com/ugorji/go/codec/fast-path.not.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/gen-dec-array.go.tmpl b/vendor/github.com/ugorji/go/codec/gen-dec-array.go.tmpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/gen-dec-array.go.tmpl
rename to vendor/github.com/ugorji/go/codec/gen-dec-array.go.tmpl
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/gen-dec-map.go.tmpl b/vendor/github.com/ugorji/go/codec/gen-dec-map.go.tmpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/gen-dec-map.go.tmpl
rename to vendor/github.com/ugorji/go/codec/gen-dec-map.go.tmpl
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/gen-helper.generated.go b/vendor/github.com/ugorji/go/codec/gen-helper.generated.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/gen-helper.generated.go
rename to vendor/github.com/ugorji/go/codec/gen-helper.generated.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/gen-helper.go.tmpl b/vendor/github.com/ugorji/go/codec/gen-helper.go.tmpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/gen-helper.go.tmpl
rename to vendor/github.com/ugorji/go/codec/gen-helper.go.tmpl
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/gen.generated.go b/vendor/github.com/ugorji/go/codec/gen.generated.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/gen.generated.go
rename to vendor/github.com/ugorji/go/codec/gen.generated.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/gen.go b/vendor/github.com/ugorji/go/codec/gen.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/gen.go
rename to vendor/github.com/ugorji/go/codec/gen.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/helper.go b/vendor/github.com/ugorji/go/codec/helper.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/helper.go
rename to vendor/github.com/ugorji/go/codec/helper.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/helper_internal.go b/vendor/github.com/ugorji/go/codec/helper_internal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/helper_internal.go
rename to vendor/github.com/ugorji/go/codec/helper_internal.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/helper_not_unsafe.go b/vendor/github.com/ugorji/go/codec/helper_not_unsafe.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/helper_not_unsafe.go
rename to vendor/github.com/ugorji/go/codec/helper_not_unsafe.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/helper_unsafe.go b/vendor/github.com/ugorji/go/codec/helper_unsafe.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/helper_unsafe.go
rename to vendor/github.com/ugorji/go/codec/helper_unsafe.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/json.go b/vendor/github.com/ugorji/go/codec/json.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/json.go
rename to vendor/github.com/ugorji/go/codec/json.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/msgpack.go b/vendor/github.com/ugorji/go/codec/msgpack.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/msgpack.go
rename to vendor/github.com/ugorji/go/codec/msgpack.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/noop.go b/vendor/github.com/ugorji/go/codec/noop.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/noop.go
rename to vendor/github.com/ugorji/go/codec/noop.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/prebuild.go b/vendor/github.com/ugorji/go/codec/prebuild.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/prebuild.go
rename to vendor/github.com/ugorji/go/codec/prebuild.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/prebuild.sh b/vendor/github.com/ugorji/go/codec/prebuild.sh
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/prebuild.sh
rename to vendor/github.com/ugorji/go/codec/prebuild.sh
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/rpc.go b/vendor/github.com/ugorji/go/codec/rpc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/rpc.go
rename to vendor/github.com/ugorji/go/codec/rpc.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/simple.go b/vendor/github.com/ugorji/go/codec/simple.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/simple.go
rename to vendor/github.com/ugorji/go/codec/simple.go
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/test-cbor-goldens.json b/vendor/github.com/ugorji/go/codec/test-cbor-goldens.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/test-cbor-goldens.json
rename to vendor/github.com/ugorji/go/codec/test-cbor-goldens.json
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/test.py b/vendor/github.com/ugorji/go/codec/test.py
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/test.py
rename to vendor/github.com/ugorji/go/codec/test.py
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/tests.sh b/vendor/github.com/ugorji/go/codec/tests.sh
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/tests.sh
rename to vendor/github.com/ugorji/go/codec/tests.sh
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/codec/time.go b/vendor/github.com/ugorji/go/codec/time.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/codec/time.go
rename to vendor/github.com/ugorji/go/codec/time.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/.travis.yml b/vendor/github.com/vishvananda/netlink/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/.travis.yml
rename to vendor/github.com/vishvananda/netlink/.travis.yml
diff --git a/vendor/github.com/vishvananda/netlink/LICENSE b/vendor/github.com/vishvananda/netlink/LICENSE
new file mode 100644
index 0000000000..9f64db8582
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/LICENSE
@@ -0,0 +1,192 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2014 Vishvananda Ishaya.
+   Copyright 2014 Docker, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/Makefile b/vendor/github.com/vishvananda/netlink/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/Makefile
rename to vendor/github.com/vishvananda/netlink/Makefile
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/README.md b/vendor/github.com/vishvananda/netlink/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/README.md
rename to vendor/github.com/vishvananda/netlink/README.md
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr.go b/vendor/github.com/vishvananda/netlink/addr.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/addr.go
rename to vendor/github.com/vishvananda/netlink/addr.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go b/vendor/github.com/vishvananda/netlink/addr_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go
rename to vendor/github.com/vishvananda/netlink/addr_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/filter.go b/vendor/github.com/vishvananda/netlink/filter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/filter.go
rename to vendor/github.com/vishvananda/netlink/filter.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/filter_linux.go b/vendor/github.com/vishvananda/netlink/filter_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/filter_linux.go
rename to vendor/github.com/vishvananda/netlink/filter_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/link.go b/vendor/github.com/vishvananda/netlink/link.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/link.go
rename to vendor/github.com/vishvananda/netlink/link.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go b/vendor/github.com/vishvananda/netlink/link_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go
rename to vendor/github.com/vishvananda/netlink/link_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh.go b/vendor/github.com/vishvananda/netlink/neigh.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/neigh.go
rename to vendor/github.com/vishvananda/netlink/neigh.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go b/vendor/github.com/vishvananda/netlink/neigh_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go
rename to vendor/github.com/vishvananda/netlink/neigh_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go b/vendor/github.com/vishvananda/netlink/netlink.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go
rename to vendor/github.com/vishvananda/netlink/netlink.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink_unspecified.go b/vendor/github.com/vishvananda/netlink/netlink_unspecified.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/netlink_unspecified.go
rename to vendor/github.com/vishvananda/netlink/netlink_unspecified.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/addr_linux.go b/vendor/github.com/vishvananda/netlink/nl/addr_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/addr_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/addr_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/link_linux.go b/vendor/github.com/vishvananda/netlink/nl/link_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/link_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/link_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/nl_linux.go b/vendor/github.com/vishvananda/netlink/nl/nl_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/nl_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/nl_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/route_linux.go b/vendor/github.com/vishvananda/netlink/nl/route_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/route_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/route_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/tc_linux.go b/vendor/github.com/vishvananda/netlink/nl/tc_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/tc_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/tc_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_linux.go b/vendor/github.com/vishvananda/netlink/nl/xfrm_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/xfrm_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go b/vendor/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_state_linux.go b/vendor/github.com/vishvananda/netlink/nl/xfrm_state_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_state_linux.go
rename to vendor/github.com/vishvananda/netlink/nl/xfrm_state_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo.go b/vendor/github.com/vishvananda/netlink/protinfo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo.go
rename to vendor/github.com/vishvananda/netlink/protinfo.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go b/vendor/github.com/vishvananda/netlink/protinfo_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go
rename to vendor/github.com/vishvananda/netlink/protinfo_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc.go b/vendor/github.com/vishvananda/netlink/qdisc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc.go
rename to vendor/github.com/vishvananda/netlink/qdisc.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc_linux.go b/vendor/github.com/vishvananda/netlink/qdisc_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc_linux.go
rename to vendor/github.com/vishvananda/netlink/qdisc_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/route.go b/vendor/github.com/vishvananda/netlink/route.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/route.go
rename to vendor/github.com/vishvananda/netlink/route.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go b/vendor/github.com/vishvananda/netlink/route_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go
rename to vendor/github.com/vishvananda/netlink/route_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm.go b/vendor/github.com/vishvananda/netlink/xfrm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm.go
rename to vendor/github.com/vishvananda/netlink/xfrm.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy.go b/vendor/github.com/vishvananda/netlink/xfrm_policy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy.go
rename to vendor/github.com/vishvananda/netlink/xfrm_policy.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go b/vendor/github.com/vishvananda/netlink/xfrm_policy_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go
rename to vendor/github.com/vishvananda/netlink/xfrm_policy_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state.go b/vendor/github.com/vishvananda/netlink/xfrm_state.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state.go
rename to vendor/github.com/vishvananda/netlink/xfrm_state.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go b/vendor/github.com/vishvananda/netlink/xfrm_state_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go
rename to vendor/github.com/vishvananda/netlink/xfrm_state_linux.go
diff --git a/Godeps/_workspace/src/github.com/xiang90/probing/.gitignore b/vendor/github.com/xiang90/probing/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/xiang90/probing/.gitignore
rename to vendor/github.com/xiang90/probing/.gitignore
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/xiang90/probing/LICENSE b/vendor/github.com/xiang90/probing/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/xiang90/probing/LICENSE
rename to vendor/github.com/xiang90/probing/LICENSE
diff --git a/Godeps/_workspace/src/github.com/xiang90/probing/README.md b/vendor/github.com/xiang90/probing/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/xiang90/probing/README.md
rename to vendor/github.com/xiang90/probing/README.md
diff --git a/Godeps/_workspace/src/github.com/xiang90/probing/prober.go b/vendor/github.com/xiang90/probing/prober.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xiang90/probing/prober.go
rename to vendor/github.com/xiang90/probing/prober.go
diff --git a/Godeps/_workspace/src/github.com/xiang90/probing/server.go b/vendor/github.com/xiang90/probing/server.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xiang90/probing/server.go
rename to vendor/github.com/xiang90/probing/server.go
diff --git a/Godeps/_workspace/src/github.com/xiang90/probing/status.go b/vendor/github.com/xiang90/probing/status.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xiang90/probing/status.go
rename to vendor/github.com/xiang90/probing/status.go
diff --git a/Godeps/_workspace/src/github.com/xyproto/simpleredis/.travis.yml b/vendor/github.com/xyproto/simpleredis/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/xyproto/simpleredis/.travis.yml
rename to vendor/github.com/xyproto/simpleredis/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/xyproto/simpleredis/LICENSE b/vendor/github.com/xyproto/simpleredis/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/xyproto/simpleredis/LICENSE
rename to vendor/github.com/xyproto/simpleredis/LICENSE
diff --git a/Godeps/_workspace/src/github.com/xyproto/simpleredis/README.md b/vendor/github.com/xyproto/simpleredis/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/xyproto/simpleredis/README.md
rename to vendor/github.com/xyproto/simpleredis/README.md
diff --git a/Godeps/_workspace/src/github.com/xyproto/simpleredis/TODO.md b/vendor/github.com/xyproto/simpleredis/TODO.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/xyproto/simpleredis/TODO.md
rename to vendor/github.com/xyproto/simpleredis/TODO.md
diff --git a/Godeps/_workspace/src/github.com/xyproto/simpleredis/example/main.go b/vendor/github.com/xyproto/simpleredis/example/main.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xyproto/simpleredis/example/main.go
rename to vendor/github.com/xyproto/simpleredis/example/main.go
diff --git a/Godeps/_workspace/src/github.com/xyproto/simpleredis/simpleredis.go b/vendor/github.com/xyproto/simpleredis/simpleredis.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xyproto/simpleredis/simpleredis.go
rename to vendor/github.com/xyproto/simpleredis/simpleredis.go
diff --git a/vendor/go4.org/LICENSE b/vendor/go4.org/LICENSE
new file mode 100644
index 0000000000..8f71f43fee
--- /dev/null
+++ b/vendor/go4.org/LICENSE
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/Godeps/_workspace/src/github.com/camlistore/go4/errorutil/highlight.go b/vendor/go4.org/errorutil/highlight.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/camlistore/go4/errorutil/highlight.go
rename to vendor/go4.org/errorutil/highlight.go
diff --git a/vendor/go4.org/legal/legal.go b/vendor/go4.org/legal/legal.go
new file mode 100644
index 0000000000..de9ae9c858
--- /dev/null
+++ b/vendor/go4.org/legal/legal.go
@@ -0,0 +1,32 @@
+/*
+Copyright 2014 The Go4 Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package legal provides in-process storage for compiled-in licenses.
+package legal
+
+var licenses []string
+
+// RegisterLicense stores the license text.
+// It doesn't check whether the text was already present.
+func RegisterLicense(text string) {
+	licenses = append(licenses, text)
+	return
+}
+
+// Licenses returns a slice of the licenses.
+func Licenses() []string {
+	return licenses
+}
diff --git a/vendor/golang.org/x/crypto/LICENSE b/vendor/golang.org/x/crypto/LICENSE
new file mode 100644
index 0000000000..6a66aea5ea
--- /dev/null
+++ b/vendor/golang.org/x/crypto/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/crypto/PATENTS b/vendor/golang.org/x/crypto/PATENTS
new file mode 100644
index 0000000000..733099041f
--- /dev/null
+++ b/vendor/golang.org/x/crypto/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Go project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/base64.go b/vendor/golang.org/x/crypto/bcrypt/base64.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/bcrypt/base64.go
rename to vendor/golang.org/x/crypto/bcrypt/base64.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt.go b/vendor/golang.org/x/crypto/bcrypt/bcrypt.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt.go
rename to vendor/golang.org/x/crypto/bcrypt/bcrypt.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/blowfish/block.go b/vendor/golang.org/x/crypto/blowfish/block.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/blowfish/block.go
rename to vendor/golang.org/x/crypto/blowfish/block.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/blowfish/cipher.go b/vendor/golang.org/x/crypto/blowfish/cipher.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/blowfish/cipher.go
rename to vendor/golang.org/x/crypto/blowfish/cipher.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/blowfish/const.go b/vendor/golang.org/x/crypto/blowfish/const.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/blowfish/const.go
rename to vendor/golang.org/x/crypto/blowfish/const.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/client.go b/vendor/golang.org/x/crypto/ssh/agent/client.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/client.go
rename to vendor/golang.org/x/crypto/ssh/agent/client.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/forward.go b/vendor/golang.org/x/crypto/ssh/agent/forward.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/forward.go
rename to vendor/golang.org/x/crypto/ssh/agent/forward.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/keyring.go b/vendor/golang.org/x/crypto/ssh/agent/keyring.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/keyring.go
rename to vendor/golang.org/x/crypto/ssh/agent/keyring.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/server.go b/vendor/golang.org/x/crypto/ssh/agent/server.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/server.go
rename to vendor/golang.org/x/crypto/ssh/agent/server.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/buffer.go b/vendor/golang.org/x/crypto/ssh/buffer.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/buffer.go
rename to vendor/golang.org/x/crypto/ssh/buffer.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/certs.go b/vendor/golang.org/x/crypto/ssh/certs.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/certs.go
rename to vendor/golang.org/x/crypto/ssh/certs.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/channel.go b/vendor/golang.org/x/crypto/ssh/channel.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/channel.go
rename to vendor/golang.org/x/crypto/ssh/channel.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/cipher.go b/vendor/golang.org/x/crypto/ssh/cipher.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/cipher.go
rename to vendor/golang.org/x/crypto/ssh/cipher.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/client.go b/vendor/golang.org/x/crypto/ssh/client.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/client.go
rename to vendor/golang.org/x/crypto/ssh/client.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/client_auth.go b/vendor/golang.org/x/crypto/ssh/client_auth.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/client_auth.go
rename to vendor/golang.org/x/crypto/ssh/client_auth.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/common.go b/vendor/golang.org/x/crypto/ssh/common.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/common.go
rename to vendor/golang.org/x/crypto/ssh/common.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/connection.go b/vendor/golang.org/x/crypto/ssh/connection.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/connection.go
rename to vendor/golang.org/x/crypto/ssh/connection.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/doc.go b/vendor/golang.org/x/crypto/ssh/doc.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/doc.go
rename to vendor/golang.org/x/crypto/ssh/doc.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/handshake.go b/vendor/golang.org/x/crypto/ssh/handshake.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/handshake.go
rename to vendor/golang.org/x/crypto/ssh/handshake.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/kex.go b/vendor/golang.org/x/crypto/ssh/kex.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/kex.go
rename to vendor/golang.org/x/crypto/ssh/kex.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/keys.go b/vendor/golang.org/x/crypto/ssh/keys.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/keys.go
rename to vendor/golang.org/x/crypto/ssh/keys.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/mac.go b/vendor/golang.org/x/crypto/ssh/mac.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/mac.go
rename to vendor/golang.org/x/crypto/ssh/mac.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/messages.go b/vendor/golang.org/x/crypto/ssh/messages.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/messages.go
rename to vendor/golang.org/x/crypto/ssh/messages.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/mux.go b/vendor/golang.org/x/crypto/ssh/mux.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/mux.go
rename to vendor/golang.org/x/crypto/ssh/mux.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/server.go b/vendor/golang.org/x/crypto/ssh/server.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/server.go
rename to vendor/golang.org/x/crypto/ssh/server.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/session.go b/vendor/golang.org/x/crypto/ssh/session.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/session.go
rename to vendor/golang.org/x/crypto/ssh/session.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/tcpip.go b/vendor/golang.org/x/crypto/ssh/tcpip.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/tcpip.go
rename to vendor/golang.org/x/crypto/ssh/tcpip.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/terminal.go b/vendor/golang.org/x/crypto/ssh/terminal/terminal.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/terminal.go
rename to vendor/golang.org/x/crypto/ssh/terminal/terminal.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util.go b/vendor/golang.org/x/crypto/ssh/terminal/util.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util.go
rename to vendor/golang.org/x/crypto/ssh/terminal/util.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_bsd.go b/vendor/golang.org/x/crypto/ssh/terminal/util_bsd.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_bsd.go
rename to vendor/golang.org/x/crypto/ssh/terminal/util_bsd.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_linux.go b/vendor/golang.org/x/crypto/ssh/terminal/util_linux.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_linux.go
rename to vendor/golang.org/x/crypto/ssh/terminal/util_linux.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_windows.go b/vendor/golang.org/x/crypto/ssh/terminal/util_windows.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_windows.go
rename to vendor/golang.org/x/crypto/ssh/terminal/util_windows.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/test/doc.go b/vendor/golang.org/x/crypto/ssh/test/doc.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/test/doc.go
rename to vendor/golang.org/x/crypto/ssh/test/doc.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/transport.go b/vendor/golang.org/x/crypto/ssh/transport.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/transport.go
rename to vendor/golang.org/x/crypto/ssh/transport.go
diff --git a/vendor/golang.org/x/exp/LICENSE b/vendor/golang.org/x/exp/LICENSE
new file mode 100644
index 0000000000..6a66aea5ea
--- /dev/null
+++ b/vendor/golang.org/x/exp/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/exp/PATENTS b/vendor/golang.org/x/exp/PATENTS
new file mode 100644
index 0000000000..733099041f
--- /dev/null
+++ b/vendor/golang.org/x/exp/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Go project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.
diff --git a/Godeps/_workspace/src/golang.org/x/exp/inotify/inotify_linux.go b/vendor/golang.org/x/exp/inotify/inotify_linux.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/exp/inotify/inotify_linux.go
rename to vendor/golang.org/x/exp/inotify/inotify_linux.go
diff --git a/vendor/golang.org/x/net/LICENSE b/vendor/golang.org/x/net/LICENSE
new file mode 100644
index 0000000000..6a66aea5ea
--- /dev/null
+++ b/vendor/golang.org/x/net/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/net/PATENTS b/vendor/golang.org/x/net/PATENTS
new file mode 100644
index 0000000000..733099041f
--- /dev/null
+++ b/vendor/golang.org/x/net/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Go project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.
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/charset/gen.go b/vendor/golang.org/x/net/html/charset/gen.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/html/charset/gen.go
rename to vendor/golang.org/x/net/html/charset/gen.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/table.go b/vendor/golang.org/x/net/html/charset/table.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/html/charset/table.go
rename to vendor/golang.org/x/net/html/charset/table.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/http2/.gitignore b/vendor/golang.org/x/net/http2/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/.gitignore
rename to vendor/golang.org/x/net/http2/.gitignore
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/Dockerfile b/vendor/golang.org/x/net/http2/Dockerfile
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/Dockerfile
rename to vendor/golang.org/x/net/http2/Dockerfile
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/Makefile b/vendor/golang.org/x/net/http2/Makefile
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/Makefile
rename to vendor/golang.org/x/net/http2/Makefile
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/README b/vendor/golang.org/x/net/http2/README
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/README
rename to vendor/golang.org/x/net/http2/README
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/buffer.go b/vendor/golang.org/x/net/http2/buffer.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/buffer.go
rename to vendor/golang.org/x/net/http2/buffer.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/errors.go b/vendor/golang.org/x/net/http2/errors.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/errors.go
rename to vendor/golang.org/x/net/http2/errors.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/flow.go b/vendor/golang.org/x/net/http2/flow.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/flow.go
rename to vendor/golang.org/x/net/http2/flow.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/frame.go b/vendor/golang.org/x/net/http2/frame.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/frame.go
rename to vendor/golang.org/x/net/http2/frame.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/gotrack.go b/vendor/golang.org/x/net/http2/gotrack.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/gotrack.go
rename to vendor/golang.org/x/net/http2/gotrack.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/.gitignore b/vendor/golang.org/x/net/http2/h2demo/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/h2demo/.gitignore
rename to vendor/golang.org/x/net/http2/h2demo/.gitignore
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/Makefile b/vendor/golang.org/x/net/http2/h2demo/Makefile
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/h2demo/Makefile
rename to vendor/golang.org/x/net/http2/h2demo/Makefile
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/README b/vendor/golang.org/x/net/http2/h2demo/README
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/h2demo/README
rename to vendor/golang.org/x/net/http2/h2demo/README
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/h2demo.go b/vendor/golang.org/x/net/http2/h2demo/h2demo.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/h2demo/h2demo.go
rename to vendor/golang.org/x/net/http2/h2demo/h2demo.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/launch.go b/vendor/golang.org/x/net/http2/h2demo/launch.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/h2demo/launch.go
rename to vendor/golang.org/x/net/http2/h2demo/launch.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.key b/vendor/golang.org/x/net/http2/h2demo/rootCA.key
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.key
rename to vendor/golang.org/x/net/http2/h2demo/rootCA.key
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.pem b/vendor/golang.org/x/net/http2/h2demo/rootCA.pem
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.pem
rename to vendor/golang.org/x/net/http2/h2demo/rootCA.pem
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.srl b/vendor/golang.org/x/net/http2/h2demo/rootCA.srl
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.srl
rename to vendor/golang.org/x/net/http2/h2demo/rootCA.srl
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/server.crt b/vendor/golang.org/x/net/http2/h2demo/server.crt
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/h2demo/server.crt
rename to vendor/golang.org/x/net/http2/h2demo/server.crt
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/server.key b/vendor/golang.org/x/net/http2/h2demo/server.key
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/h2demo/server.key
rename to vendor/golang.org/x/net/http2/h2demo/server.key
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2i/README.md b/vendor/golang.org/x/net/http2/h2i/README.md
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/h2i/README.md
rename to vendor/golang.org/x/net/http2/h2i/README.md
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2i/h2i.go b/vendor/golang.org/x/net/http2/h2i/h2i.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/h2i/h2i.go
rename to vendor/golang.org/x/net/http2/h2i/h2i.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/headermap.go b/vendor/golang.org/x/net/http2/headermap.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/headermap.go
rename to vendor/golang.org/x/net/http2/headermap.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/encode.go b/vendor/golang.org/x/net/http2/hpack/encode.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/hpack/encode.go
rename to vendor/golang.org/x/net/http2/hpack/encode.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/hpack.go b/vendor/golang.org/x/net/http2/hpack/hpack.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/hpack/hpack.go
rename to vendor/golang.org/x/net/http2/hpack/hpack.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/huffman.go b/vendor/golang.org/x/net/http2/hpack/huffman.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/hpack/huffman.go
rename to vendor/golang.org/x/net/http2/hpack/huffman.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/tables.go b/vendor/golang.org/x/net/http2/hpack/tables.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/hpack/tables.go
rename to vendor/golang.org/x/net/http2/hpack/tables.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/http2.go b/vendor/golang.org/x/net/http2/http2.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/http2.go
rename to vendor/golang.org/x/net/http2/http2.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/pipe.go b/vendor/golang.org/x/net/http2/pipe.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/pipe.go
rename to vendor/golang.org/x/net/http2/pipe.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/server.go
rename to vendor/golang.org/x/net/http2/server.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/transport.go
rename to vendor/golang.org/x/net/http2/transport.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/write.go b/vendor/golang.org/x/net/http2/write.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/write.go
rename to vendor/golang.org/x/net/http2/write.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/writesched.go b/vendor/golang.org/x/net/http2/writesched.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/http2/writesched.go
rename to vendor/golang.org/x/net/http2/writesched.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/timeseries/timeseries.go b/vendor/golang.org/x/net/internal/timeseries/timeseries.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/internal/timeseries/timeseries.go
rename to vendor/golang.org/x/net/internal/timeseries/timeseries.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/proxy/direct.go b/vendor/golang.org/x/net/proxy/direct.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/proxy/direct.go
rename to vendor/golang.org/x/net/proxy/direct.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/proxy/per_host.go b/vendor/golang.org/x/net/proxy/per_host.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/proxy/per_host.go
rename to vendor/golang.org/x/net/proxy/per_host.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/proxy/proxy.go b/vendor/golang.org/x/net/proxy/proxy.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/proxy/proxy.go
rename to vendor/golang.org/x/net/proxy/proxy.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/proxy/socks5.go b/vendor/golang.org/x/net/proxy/socks5.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/proxy/socks5.go
rename to vendor/golang.org/x/net/proxy/socks5.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/trace/events.go b/vendor/golang.org/x/net/trace/events.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/trace/events.go
rename to vendor/golang.org/x/net/trace/events.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/trace/histogram.go b/vendor/golang.org/x/net/trace/histogram.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/trace/histogram.go
rename to vendor/golang.org/x/net/trace/histogram.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/trace/trace.go b/vendor/golang.org/x/net/trace/trace.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/net/trace/trace.go
rename to vendor/golang.org/x/net/trace/trace.go
diff --git a/Godeps/_workspace/src/golang.org/x/net/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/oauth2/.travis.yml b/vendor/golang.org/x/oauth2/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/.travis.yml
rename to vendor/golang.org/x/oauth2/.travis.yml
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/AUTHORS b/vendor/golang.org/x/oauth2/AUTHORS
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/AUTHORS
rename to vendor/golang.org/x/oauth2/AUTHORS
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/CONTRIBUTING.md b/vendor/golang.org/x/oauth2/CONTRIBUTING.md
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/CONTRIBUTING.md
rename to vendor/golang.org/x/oauth2/CONTRIBUTING.md
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/CONTRIBUTORS b/vendor/golang.org/x/oauth2/CONTRIBUTORS
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/CONTRIBUTORS
rename to vendor/golang.org/x/oauth2/CONTRIBUTORS
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/LICENSE b/vendor/golang.org/x/oauth2/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/LICENSE
rename to vendor/golang.org/x/oauth2/LICENSE
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/README.md b/vendor/golang.org/x/oauth2/README.md
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/README.md
rename to vendor/golang.org/x/oauth2/README.md
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/client_appengine.go b/vendor/golang.org/x/oauth2/client_appengine.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/client_appengine.go
rename to vendor/golang.org/x/oauth2/client_appengine.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/clientcredentials/clientcredentials.go b/vendor/golang.org/x/oauth2/clientcredentials/clientcredentials.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/clientcredentials/clientcredentials.go
rename to vendor/golang.org/x/oauth2/clientcredentials/clientcredentials.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/facebook/facebook.go b/vendor/golang.org/x/oauth2/facebook/facebook.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/facebook/facebook.go
rename to vendor/golang.org/x/oauth2/facebook/facebook.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/github/github.go b/vendor/golang.org/x/oauth2/github/github.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/github/github.go
rename to vendor/golang.org/x/oauth2/github/github.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/google/appengine.go b/vendor/golang.org/x/oauth2/google/appengine.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/google/appengine.go
rename to vendor/golang.org/x/oauth2/google/appengine.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/google/appengine_hook.go b/vendor/golang.org/x/oauth2/google/appengine_hook.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/google/appengine_hook.go
rename to vendor/golang.org/x/oauth2/google/appengine_hook.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/google/default.go b/vendor/golang.org/x/oauth2/google/default.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/google/default.go
rename to vendor/golang.org/x/oauth2/google/default.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/google/google.go b/vendor/golang.org/x/oauth2/google/google.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/google/google.go
rename to vendor/golang.org/x/oauth2/google/google.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/google/sdk.go b/vendor/golang.org/x/oauth2/google/sdk.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/google/sdk.go
rename to vendor/golang.org/x/oauth2/google/sdk.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/internal/oauth2.go b/vendor/golang.org/x/oauth2/internal/oauth2.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/internal/oauth2.go
rename to vendor/golang.org/x/oauth2/internal/oauth2.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/internal/token.go b/vendor/golang.org/x/oauth2/internal/token.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/internal/token.go
rename to vendor/golang.org/x/oauth2/internal/token.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/internal/transport.go b/vendor/golang.org/x/oauth2/internal/transport.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/internal/transport.go
rename to vendor/golang.org/x/oauth2/internal/transport.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/jws/jws.go b/vendor/golang.org/x/oauth2/jws/jws.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/jws/jws.go
rename to vendor/golang.org/x/oauth2/jws/jws.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/jwt/jwt.go b/vendor/golang.org/x/oauth2/jwt/jwt.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/jwt/jwt.go
rename to vendor/golang.org/x/oauth2/jwt/jwt.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/linkedin/linkedin.go b/vendor/golang.org/x/oauth2/linkedin/linkedin.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/linkedin/linkedin.go
rename to vendor/golang.org/x/oauth2/linkedin/linkedin.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/oauth2.go b/vendor/golang.org/x/oauth2/oauth2.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/oauth2.go
rename to vendor/golang.org/x/oauth2/oauth2.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/odnoklassniki/odnoklassniki.go b/vendor/golang.org/x/oauth2/odnoklassniki/odnoklassniki.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/odnoklassniki/odnoklassniki.go
rename to vendor/golang.org/x/oauth2/odnoklassniki/odnoklassniki.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/paypal/paypal.go b/vendor/golang.org/x/oauth2/paypal/paypal.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/paypal/paypal.go
rename to vendor/golang.org/x/oauth2/paypal/paypal.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/token.go b/vendor/golang.org/x/oauth2/token.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/token.go
rename to vendor/golang.org/x/oauth2/token.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/transport.go b/vendor/golang.org/x/oauth2/transport.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/transport.go
rename to vendor/golang.org/x/oauth2/transport.go
diff --git a/Godeps/_workspace/src/golang.org/x/oauth2/vk/vk.go b/vendor/golang.org/x/oauth2/vk/vk.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/oauth2/vk/vk.go
rename to vendor/golang.org/x/oauth2/vk/vk.go
diff --git a/vendor/golang.org/x/sys/LICENSE b/vendor/golang.org/x/sys/LICENSE
new file mode 100644
index 0000000000..6a66aea5ea
--- /dev/null
+++ b/vendor/golang.org/x/sys/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/sys/PATENTS b/vendor/golang.org/x/sys/PATENTS
new file mode 100644
index 0000000000..733099041f
--- /dev/null
+++ b/vendor/golang.org/x/sys/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Go project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.
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/google.golang.org/api/LICENSE b/vendor/google.golang.org/api/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/LICENSE
rename to vendor/google.golang.org/api/LICENSE
diff --git a/Godeps/_workspace/src/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-api.json b/vendor/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-api.json
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-api.json
rename to vendor/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-api.json
diff --git a/Godeps/_workspace/src/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-gen.go b/vendor/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-gen.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-gen.go
rename to vendor/google.golang.org/api/cloudmonitoring/v2beta2/cloudmonitoring-gen.go
diff --git a/Godeps/_workspace/src/google.golang.org/api/compute/v1/compute-api.json b/vendor/google.golang.org/api/compute/v1/compute-api.json
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/compute/v1/compute-api.json
rename to vendor/google.golang.org/api/compute/v1/compute-api.json
diff --git a/Godeps/_workspace/src/google.golang.org/api/compute/v1/compute-gen.go b/vendor/google.golang.org/api/compute/v1/compute-gen.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/compute/v1/compute-gen.go
rename to vendor/google.golang.org/api/compute/v1/compute-gen.go
diff --git a/Godeps/_workspace/src/google.golang.org/api/container/v1/container-api.json b/vendor/google.golang.org/api/container/v1/container-api.json
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/container/v1/container-api.json
rename to vendor/google.golang.org/api/container/v1/container-api.json
diff --git a/Godeps/_workspace/src/google.golang.org/api/container/v1/container-gen.go b/vendor/google.golang.org/api/container/v1/container-gen.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/container/v1/container-gen.go
rename to vendor/google.golang.org/api/container/v1/container-gen.go
diff --git a/Godeps/_workspace/src/google.golang.org/api/gensupport/doc.go b/vendor/google.golang.org/api/gensupport/doc.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/gensupport/doc.go
rename to vendor/google.golang.org/api/gensupport/doc.go
diff --git a/Godeps/_workspace/src/google.golang.org/api/gensupport/json.go b/vendor/google.golang.org/api/gensupport/json.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/gensupport/json.go
rename to vendor/google.golang.org/api/gensupport/json.go
diff --git a/Godeps/_workspace/src/google.golang.org/api/gensupport/media.go b/vendor/google.golang.org/api/gensupport/media.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/gensupport/media.go
rename to vendor/google.golang.org/api/gensupport/media.go
diff --git a/Godeps/_workspace/src/google.golang.org/api/gensupport/params.go b/vendor/google.golang.org/api/gensupport/params.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/gensupport/params.go
rename to vendor/google.golang.org/api/gensupport/params.go
diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi.go b/vendor/google.golang.org/api/googleapi/googleapi.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi.go
rename to vendor/google.golang.org/api/googleapi/googleapi.go
diff --git a/vendor/google.golang.org/api/googleapi/internal/uritemplates/LICENSE b/vendor/google.golang.org/api/googleapi/internal/uritemplates/LICENSE
new file mode 100644
index 0000000000..de9c88cb65
--- /dev/null
+++ b/vendor/google.golang.org/api/googleapi/internal/uritemplates/LICENSE
@@ -0,0 +1,18 @@
+Copyright (c) 2013 Joshua Tacoma
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go b/vendor/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go
rename to vendor/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go
diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/utils.go b/vendor/google.golang.org/api/googleapi/internal/uritemplates/utils.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/utils.go
rename to vendor/google.golang.org/api/googleapi/internal/uritemplates/utils.go
diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/transport/apikey.go b/vendor/google.golang.org/api/googleapi/transport/apikey.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/googleapi/transport/apikey.go
rename to vendor/google.golang.org/api/googleapi/transport/apikey.go
diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/types.go b/vendor/google.golang.org/api/googleapi/types.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/api/googleapi/types.go
rename to vendor/google.golang.org/api/googleapi/types.go
diff --git a/Godeps/_workspace/src/google.golang.org/cloud/LICENSE b/vendor/google.golang.org/cloud/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/cloud/LICENSE
rename to vendor/google.golang.org/cloud/LICENSE
diff --git a/Godeps/_workspace/src/google.golang.org/cloud/compute/metadata/metadata.go b/vendor/google.golang.org/cloud/compute/metadata/metadata.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/cloud/compute/metadata/metadata.go
rename to vendor/google.golang.org/cloud/compute/metadata/metadata.go
diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/cloud.go b/vendor/google.golang.org/cloud/internal/cloud.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/cloud/internal/cloud.go
rename to vendor/google.golang.org/cloud/internal/cloud.go
diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/datastore/datastore_v1.pb.go b/vendor/google.golang.org/cloud/internal/datastore/datastore_v1.pb.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/cloud/internal/datastore/datastore_v1.pb.go
rename to vendor/google.golang.org/cloud/internal/datastore/datastore_v1.pb.go
diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/datastore/datastore_v1.proto b/vendor/google.golang.org/cloud/internal/datastore/datastore_v1.proto
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/cloud/internal/datastore/datastore_v1.proto
rename to vendor/google.golang.org/cloud/internal/datastore/datastore_v1.proto
diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/opts/option.go b/vendor/google.golang.org/cloud/internal/opts/option.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/cloud/internal/opts/option.go
rename to vendor/google.golang.org/cloud/internal/opts/option.go
diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/testutil/context.go b/vendor/google.golang.org/cloud/internal/testutil/context.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/cloud/internal/testutil/context.go
rename to vendor/google.golang.org/cloud/internal/testutil/context.go
diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/transport/cancelreq.go b/vendor/google.golang.org/cloud/internal/transport/cancelreq.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/cloud/internal/transport/cancelreq.go
rename to vendor/google.golang.org/cloud/internal/transport/cancelreq.go
diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/transport/cancelreq_legacy.go b/vendor/google.golang.org/cloud/internal/transport/cancelreq_legacy.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/cloud/internal/transport/cancelreq_legacy.go
rename to vendor/google.golang.org/cloud/internal/transport/cancelreq_legacy.go
diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/transport/dial.go b/vendor/google.golang.org/cloud/internal/transport/dial.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/cloud/internal/transport/dial.go
rename to vendor/google.golang.org/cloud/internal/transport/dial.go
diff --git a/Godeps/_workspace/src/google.golang.org/cloud/internal/transport/proto.go b/vendor/google.golang.org/cloud/internal/transport/proto.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/cloud/internal/transport/proto.go
rename to vendor/google.golang.org/cloud/internal/transport/proto.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/.travis.yml b/vendor/google.golang.org/grpc/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/.travis.yml
rename to vendor/google.golang.org/grpc/.travis.yml
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/CONTRIBUTING.md b/vendor/google.golang.org/grpc/CONTRIBUTING.md
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/CONTRIBUTING.md
rename to vendor/google.golang.org/grpc/CONTRIBUTING.md
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/Documentation/grpc-auth-support.md b/vendor/google.golang.org/grpc/Documentation/grpc-auth-support.md
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/Documentation/grpc-auth-support.md
rename to vendor/google.golang.org/grpc/Documentation/grpc-auth-support.md
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/LICENSE b/vendor/google.golang.org/grpc/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/LICENSE
rename to vendor/google.golang.org/grpc/LICENSE
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/Makefile b/vendor/google.golang.org/grpc/Makefile
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/Makefile
rename to vendor/google.golang.org/grpc/Makefile
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/PATENTS b/vendor/google.golang.org/grpc/PATENTS
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/PATENTS
rename to vendor/google.golang.org/grpc/PATENTS
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/README.md b/vendor/google.golang.org/grpc/README.md
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/README.md
rename to vendor/google.golang.org/grpc/README.md
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/benchmark.go b/vendor/google.golang.org/grpc/benchmark/benchmark.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/benchmark.go
rename to vendor/google.golang.org/grpc/benchmark/benchmark.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/client/main.go b/vendor/google.golang.org/grpc/benchmark/client/main.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/client/main.go
rename to vendor/google.golang.org/grpc/benchmark/client/main.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.pb.go b/vendor/google.golang.org/grpc/benchmark/grpc_testing/test.pb.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.pb.go
rename to vendor/google.golang.org/grpc/benchmark/grpc_testing/test.pb.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.proto b/vendor/google.golang.org/grpc/benchmark/grpc_testing/test.proto
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.proto
rename to vendor/google.golang.org/grpc/benchmark/grpc_testing/test.proto
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/server/main.go b/vendor/google.golang.org/grpc/benchmark/server/main.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/server/main.go
rename to vendor/google.golang.org/grpc/benchmark/server/main.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/counter.go b/vendor/google.golang.org/grpc/benchmark/stats/counter.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/counter.go
rename to vendor/google.golang.org/grpc/benchmark/stats/counter.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/histogram.go b/vendor/google.golang.org/grpc/benchmark/stats/histogram.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/histogram.go
rename to vendor/google.golang.org/grpc/benchmark/stats/histogram.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/stats.go b/vendor/google.golang.org/grpc/benchmark/stats/stats.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/stats.go
rename to vendor/google.golang.org/grpc/benchmark/stats/stats.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/timeseries.go b/vendor/google.golang.org/grpc/benchmark/stats/timeseries.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/timeseries.go
rename to vendor/google.golang.org/grpc/benchmark/stats/timeseries.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/tracker.go b/vendor/google.golang.org/grpc/benchmark/stats/tracker.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/tracker.go
rename to vendor/google.golang.org/grpc/benchmark/stats/tracker.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/util.go b/vendor/google.golang.org/grpc/benchmark/stats/util.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/util.go
rename to vendor/google.golang.org/grpc/benchmark/stats/util.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/call.go b/vendor/google.golang.org/grpc/call.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/call.go
rename to vendor/google.golang.org/grpc/call.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/clientconn.go b/vendor/google.golang.org/grpc/clientconn.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/clientconn.go
rename to vendor/google.golang.org/grpc/clientconn.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/codegen.sh b/vendor/google.golang.org/grpc/codegen.sh
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/codegen.sh
rename to vendor/google.golang.org/grpc/codegen.sh
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/codes/code_string.go b/vendor/google.golang.org/grpc/codes/code_string.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/codes/code_string.go
rename to vendor/google.golang.org/grpc/codes/code_string.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/codes/codes.go b/vendor/google.golang.org/grpc/codes/codes.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/codes/codes.go
rename to vendor/google.golang.org/grpc/codes/codes.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/coverage.sh b/vendor/google.golang.org/grpc/coverage.sh
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/coverage.sh
rename to vendor/google.golang.org/grpc/coverage.sh
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/credentials/credentials.go b/vendor/google.golang.org/grpc/credentials/credentials.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/credentials/credentials.go
rename to vendor/google.golang.org/grpc/credentials/credentials.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/credentials/oauth/oauth.go b/vendor/google.golang.org/grpc/credentials/oauth/oauth.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/credentials/oauth/oauth.go
rename to vendor/google.golang.org/grpc/credentials/oauth/oauth.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/doc.go b/vendor/google.golang.org/grpc/doc.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/doc.go
rename to vendor/google.golang.org/grpc/doc.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/README.md b/vendor/google.golang.org/grpc/examples/README.md
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/examples/README.md
rename to vendor/google.golang.org/grpc/examples/README.md
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/gotutorial.md b/vendor/google.golang.org/grpc/examples/gotutorial.md
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/examples/gotutorial.md
rename to vendor/google.golang.org/grpc/examples/gotutorial.md
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/greeter_client/main.go b/vendor/google.golang.org/grpc/examples/helloworld/greeter_client/main.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/greeter_client/main.go
rename to vendor/google.golang.org/grpc/examples/helloworld/greeter_client/main.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/greeter_server/main.go b/vendor/google.golang.org/grpc/examples/helloworld/greeter_server/main.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/greeter_server/main.go
rename to vendor/google.golang.org/grpc/examples/helloworld/greeter_server/main.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.pb.go b/vendor/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.pb.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.pb.go
rename to vendor/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.pb.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.proto b/vendor/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.proto
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.proto
rename to vendor/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.proto
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/README.md b/vendor/google.golang.org/grpc/examples/route_guide/README.md
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/README.md
rename to vendor/google.golang.org/grpc/examples/route_guide/README.md
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/client/client.go b/vendor/google.golang.org/grpc/examples/route_guide/client/client.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/client/client.go
rename to vendor/google.golang.org/grpc/examples/route_guide/client/client.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.pb.go b/vendor/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.pb.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.pb.go
rename to vendor/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.pb.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.proto b/vendor/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.proto
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.proto
rename to vendor/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.proto
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/server/server.go b/vendor/google.golang.org/grpc/examples/route_guide/server/server.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/server/server.go
rename to vendor/google.golang.org/grpc/examples/route_guide/server/server.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/grpclog/glogger/glogger.go b/vendor/google.golang.org/grpc/grpclog/glogger/glogger.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/grpclog/glogger/glogger.go
rename to vendor/google.golang.org/grpc/grpclog/glogger/glogger.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/grpclog/logger.go b/vendor/google.golang.org/grpc/grpclog/logger.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/grpclog/logger.go
rename to vendor/google.golang.org/grpc/grpclog/logger.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health_v1alpha/health.pb.go b/vendor/google.golang.org/grpc/health/grpc_health_v1alpha/health.pb.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health_v1alpha/health.pb.go
rename to vendor/google.golang.org/grpc/health/grpc_health_v1alpha/health.pb.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health_v1alpha/health.proto b/vendor/google.golang.org/grpc/health/grpc_health_v1alpha/health.proto
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health_v1alpha/health.proto
rename to vendor/google.golang.org/grpc/health/grpc_health_v1alpha/health.proto
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/health/health.go b/vendor/google.golang.org/grpc/health/health.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/health/health.go
rename to vendor/google.golang.org/grpc/health/health.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/client/client.go b/vendor/google.golang.org/grpc/interop/client/client.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/interop/client/client.go
rename to vendor/google.golang.org/grpc/interop/client/client.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.pb.go b/vendor/google.golang.org/grpc/interop/grpc_testing/test.pb.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.pb.go
rename to vendor/google.golang.org/grpc/interop/grpc_testing/test.pb.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.proto b/vendor/google.golang.org/grpc/interop/grpc_testing/test.proto
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.proto
rename to vendor/google.golang.org/grpc/interop/grpc_testing/test.proto
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/server/server.go b/vendor/google.golang.org/grpc/interop/server/server.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/interop/server/server.go
rename to vendor/google.golang.org/grpc/interop/server/server.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/test_utils.go b/vendor/google.golang.org/grpc/interop/test_utils.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/interop/test_utils.go
rename to vendor/google.golang.org/grpc/interop/test_utils.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/metadata/metadata.go b/vendor/google.golang.org/grpc/metadata/metadata.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/metadata/metadata.go
rename to vendor/google.golang.org/grpc/metadata/metadata.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/naming/naming.go b/vendor/google.golang.org/grpc/naming/naming.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/naming/naming.go
rename to vendor/google.golang.org/grpc/naming/naming.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/peer/peer.go b/vendor/google.golang.org/grpc/peer/peer.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/peer/peer.go
rename to vendor/google.golang.org/grpc/peer/peer.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/picker.go b/vendor/google.golang.org/grpc/picker.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/picker.go
rename to vendor/google.golang.org/grpc/picker.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/rpc_util.go b/vendor/google.golang.org/grpc/rpc_util.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/rpc_util.go
rename to vendor/google.golang.org/grpc/rpc_util.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/server.go b/vendor/google.golang.org/grpc/server.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/server.go
rename to vendor/google.golang.org/grpc/server.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/stream.go b/vendor/google.golang.org/grpc/stream.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/stream.go
rename to vendor/google.golang.org/grpc/stream.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.pb.go b/vendor/google.golang.org/grpc/test/codec_perf/perf.pb.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.pb.go
rename to vendor/google.golang.org/grpc/test/codec_perf/perf.pb.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.proto b/vendor/google.golang.org/grpc/test/codec_perf/perf.proto
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.proto
rename to vendor/google.golang.org/grpc/test/codec_perf/perf.proto
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.pb.go b/vendor/google.golang.org/grpc/test/grpc_testing/test.pb.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.pb.go
rename to vendor/google.golang.org/grpc/test/grpc_testing/test.pb.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.proto b/vendor/google.golang.org/grpc/test/grpc_testing/test.proto
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.proto
rename to vendor/google.golang.org/grpc/test/grpc_testing/test.proto
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/trace.go b/vendor/google.golang.org/grpc/trace.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/trace.go
rename to vendor/google.golang.org/grpc/trace.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/control.go b/vendor/google.golang.org/grpc/transport/control.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/transport/control.go
rename to vendor/google.golang.org/grpc/transport/control.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/http2_client.go b/vendor/google.golang.org/grpc/transport/http2_client.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/transport/http2_client.go
rename to vendor/google.golang.org/grpc/transport/http2_client.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/http2_server.go b/vendor/google.golang.org/grpc/transport/http2_server.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/transport/http2_server.go
rename to vendor/google.golang.org/grpc/transport/http2_server.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/http_util.go b/vendor/google.golang.org/grpc/transport/http_util.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/transport/http_util.go
rename to vendor/google.golang.org/grpc/transport/http_util.go
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/transport.go b/vendor/google.golang.org/grpc/transport/transport.go
similarity index 100%
rename from Godeps/_workspace/src/google.golang.org/grpc/transport/transport.go
rename to vendor/google.golang.org/grpc/transport/transport.go
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/LICENSE b/vendor/gopkg.in/gcfg.v1/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/LICENSE
rename to vendor/gopkg.in/gcfg.v1/LICENSE
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/README b/vendor/gopkg.in/gcfg.v1/README
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/README
rename to vendor/gopkg.in/gcfg.v1/README
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/doc.go b/vendor/gopkg.in/gcfg.v1/doc.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/doc.go
rename to vendor/gopkg.in/gcfg.v1/doc.go
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/go1_0.go b/vendor/gopkg.in/gcfg.v1/go1_0.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/go1_0.go
rename to vendor/gopkg.in/gcfg.v1/go1_0.go
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/go1_2.go b/vendor/gopkg.in/gcfg.v1/go1_2.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/go1_2.go
rename to vendor/gopkg.in/gcfg.v1/go1_2.go
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/read.go b/vendor/gopkg.in/gcfg.v1/read.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/read.go
rename to vendor/gopkg.in/gcfg.v1/read.go
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/scanner/errors.go b/vendor/gopkg.in/gcfg.v1/scanner/errors.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/scanner/errors.go
rename to vendor/gopkg.in/gcfg.v1/scanner/errors.go
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/scanner/scanner.go b/vendor/gopkg.in/gcfg.v1/scanner/scanner.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/scanner/scanner.go
rename to vendor/gopkg.in/gcfg.v1/scanner/scanner.go
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/set.go b/vendor/gopkg.in/gcfg.v1/set.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/set.go
rename to vendor/gopkg.in/gcfg.v1/set.go
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/token/position.go b/vendor/gopkg.in/gcfg.v1/token/position.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/token/position.go
rename to vendor/gopkg.in/gcfg.v1/token/position.go
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/token/serialize.go b/vendor/gopkg.in/gcfg.v1/token/serialize.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/token/serialize.go
rename to vendor/gopkg.in/gcfg.v1/token/serialize.go
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/token/token.go b/vendor/gopkg.in/gcfg.v1/token/token.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/token/token.go
rename to vendor/gopkg.in/gcfg.v1/token/token.go
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/types/bool.go b/vendor/gopkg.in/gcfg.v1/types/bool.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/types/bool.go
rename to vendor/gopkg.in/gcfg.v1/types/bool.go
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/types/doc.go b/vendor/gopkg.in/gcfg.v1/types/doc.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/types/doc.go
rename to vendor/gopkg.in/gcfg.v1/types/doc.go
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/types/enum.go b/vendor/gopkg.in/gcfg.v1/types/enum.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/types/enum.go
rename to vendor/gopkg.in/gcfg.v1/types/enum.go
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/types/int.go b/vendor/gopkg.in/gcfg.v1/types/int.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/types/int.go
rename to vendor/gopkg.in/gcfg.v1/types/int.go
diff --git a/Godeps/_workspace/src/gopkg.in/gcfg.v1/types/scan.go b/vendor/gopkg.in/gcfg.v1/types/scan.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/gcfg.v1/types/scan.go
rename to vendor/gopkg.in/gcfg.v1/types/scan.go
diff --git a/Godeps/_workspace/src/gopkg.in/natefinch/lumberjack.v2/.gitignore b/vendor/gopkg.in/natefinch/lumberjack.v2/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/natefinch/lumberjack.v2/.gitignore
rename to vendor/gopkg.in/natefinch/lumberjack.v2/.gitignore
diff --git a/Godeps/_workspace/src/gopkg.in/natefinch/lumberjack.v2/LICENSE b/vendor/gopkg.in/natefinch/lumberjack.v2/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/natefinch/lumberjack.v2/LICENSE
rename to vendor/gopkg.in/natefinch/lumberjack.v2/LICENSE
diff --git a/Godeps/_workspace/src/gopkg.in/natefinch/lumberjack.v2/README.md b/vendor/gopkg.in/natefinch/lumberjack.v2/README.md
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/natefinch/lumberjack.v2/README.md
rename to vendor/gopkg.in/natefinch/lumberjack.v2/README.md
diff --git a/Godeps/_workspace/src/gopkg.in/natefinch/lumberjack.v2/chown.go b/vendor/gopkg.in/natefinch/lumberjack.v2/chown.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/natefinch/lumberjack.v2/chown.go
rename to vendor/gopkg.in/natefinch/lumberjack.v2/chown.go
diff --git a/Godeps/_workspace/src/gopkg.in/natefinch/lumberjack.v2/chown_linux.go b/vendor/gopkg.in/natefinch/lumberjack.v2/chown_linux.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/natefinch/lumberjack.v2/chown_linux.go
rename to vendor/gopkg.in/natefinch/lumberjack.v2/chown_linux.go
diff --git a/Godeps/_workspace/src/gopkg.in/natefinch/lumberjack.v2/lumberjack.go b/vendor/gopkg.in/natefinch/lumberjack.v2/lumberjack.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/natefinch/lumberjack.v2/lumberjack.go
rename to vendor/gopkg.in/natefinch/lumberjack.v2/lumberjack.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/.travis.yml b/vendor/gopkg.in/yaml.v2/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/.travis.yml
rename to vendor/gopkg.in/yaml.v2/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/gopkg.in/yaml.v2/LICENSE b/vendor/gopkg.in/yaml.v2/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/gopkg.in/yaml.v2/LICENSE
rename to vendor/gopkg.in/yaml.v2/LICENSE
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/gopkg.in/yaml.v2/LICENSE.libyaml b/vendor/gopkg.in/yaml.v2/LICENSE.libyaml
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/gopkg.in/yaml.v2/LICENSE.libyaml
rename to vendor/gopkg.in/yaml.v2/LICENSE.libyaml
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/README.md b/vendor/gopkg.in/yaml.v2/README.md
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/README.md
rename to vendor/gopkg.in/yaml.v2/README.md
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/apic.go b/vendor/gopkg.in/yaml.v2/apic.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/apic.go
rename to vendor/gopkg.in/yaml.v2/apic.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/decode.go b/vendor/gopkg.in/yaml.v2/decode.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/decode.go
rename to vendor/gopkg.in/yaml.v2/decode.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/emitterc.go b/vendor/gopkg.in/yaml.v2/emitterc.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/emitterc.go
rename to vendor/gopkg.in/yaml.v2/emitterc.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/encode.go b/vendor/gopkg.in/yaml.v2/encode.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/encode.go
rename to vendor/gopkg.in/yaml.v2/encode.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/parserc.go b/vendor/gopkg.in/yaml.v2/parserc.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/parserc.go
rename to vendor/gopkg.in/yaml.v2/parserc.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/readerc.go b/vendor/gopkg.in/yaml.v2/readerc.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/readerc.go
rename to vendor/gopkg.in/yaml.v2/readerc.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/resolve.go b/vendor/gopkg.in/yaml.v2/resolve.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/resolve.go
rename to vendor/gopkg.in/yaml.v2/resolve.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/scannerc.go b/vendor/gopkg.in/yaml.v2/scannerc.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/scannerc.go
rename to vendor/gopkg.in/yaml.v2/scannerc.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/sorter.go b/vendor/gopkg.in/yaml.v2/sorter.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/sorter.go
rename to vendor/gopkg.in/yaml.v2/sorter.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/writerc.go b/vendor/gopkg.in/yaml.v2/writerc.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/writerc.go
rename to vendor/gopkg.in/yaml.v2/writerc.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/yaml.go b/vendor/gopkg.in/yaml.v2/yaml.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/yaml.go
rename to vendor/gopkg.in/yaml.v2/yaml.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/yamlh.go b/vendor/gopkg.in/yaml.v2/yamlh.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/yamlh.go
rename to vendor/gopkg.in/yaml.v2/yamlh.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/yamlprivateh.go b/vendor/gopkg.in/yaml.v2/yamlprivateh.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/yamlprivateh.go
rename to vendor/gopkg.in/yaml.v2/yamlprivateh.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/armon/go-metrics/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/armon/go-metrics/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/armon/go-metrics/LICENSE
rename to vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/armon/go-metrics/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/mattn/go-sqlite3/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/bigdatadev/goryman/LICENSE
similarity index 95%
rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/mattn/go-sqlite3/LICENSE
rename to vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/bigdatadev/goryman/LICENSE
index ca458bb39f..282efc468b 100644
--- a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/github.com/mattn/go-sqlite3/LICENSE
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/bigdatadev/goryman/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Yasuhiro Matsumoto
+Copyright (c) 2014 Christopher Gilbert
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
\ No newline at end of file
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/blang/semver/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/blang/semver/LICENSE
new file mode 100644
index 0000000000..5ba5c86fcb
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/blang/semver/LICENSE
@@ -0,0 +1,22 @@
+The MIT License
+
+Copyright (c) 2014 Benedikt Lang <github at benediktlang.de>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/bluebreezecf/opentsdb-goclient/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/bluebreezecf/opentsdb-goclient/LICENSE
new file mode 100644
index 0000000000..13e82a7d62
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/bluebreezecf/opentsdb-goclient/LICENSE
@@ -0,0 +1,174 @@
+				Apache License 
+
+			Version 2.0, January 2004 
+		http://www.apache.org/licenses/ 
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the
+copyright owner that is granting the License.  
+
+"Legal Entity" shall mean the union of the acting entity and all other
+entities that control, are controlled by, or are under common control
+with that entity. For the purposes of this definition, "control" means
+(i) the power, direct or indirect, to cause the direction or management
+of such entity, whether by contract or otherwise, or (ii) ownership
+of fifty percent (50%) or more of the outstanding shares, or (iii)
+beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.  
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation source,
+and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation
+or translation of a Source form, including but not limited to compiled
+object code, generated documentation, and conversions to other media
+types.  
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a copyright
+notice that is included in or attached to the work (an example is provided
+in the Appendix below).  
+
+"Derivative Works" shall mean any work, whether in Source or Object form,
+that is based on (or derived from) the Work and for which the editorial
+revisions, annotations, elaborations, or other modifications represent,
+as a whole, an original work of authorship. For the purposes of this
+License, Derivative Works shall not include works that remain separable
+from, or merely link (or bind by name) to the interfaces of, the Work
+and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the
+original version of the Work and any modifications or additions to
+that Work or Derivative Works thereof, that is intentionally submitted
+to Licensor for inclusion in the Work by the copyright owner or by an
+individual or Legal Entity authorized to submit on behalf of the copyright
+owner. For the purposes of this definition, "submitted" means any form of
+electronic, verbal, or written communication sent to the Licensor or its
+representatives, including but not limited to communication on electronic
+mailing lists, source code control systems, and issue tracking systems
+that are managed by, or on behalf of, the Licensor for the purpose of
+discussing and improving the Work, but excluding communication that is
+conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License.
+Subject to the terms and conditions of this License, each Contributor
+hereby grants to You a perpetual, worldwide, non-exclusive, no-charge,
+royalty-free, irrevocable copyright license to reproduce, prepare
+Derivative Works of, publicly display, publicly perform, sublicense, and
+distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+Subject to the terms and conditions of this License, each Contributor
+hereby grants to You a perpetual, worldwide, non-exclusive, no-charge,
+royalty- free, irrevocable (except as stated in this section) patent
+license to make, have made, use, offer to sell, sell, import, and
+otherwise transfer the Work, where such license applies only to those
+patent claims licensable by such Contributor that are necessarily
+infringed by their Contribution(s) alone or by combination of
+their Contribution(s) with the Work to which such Contribution(s)
+was submitted. If You institute patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Work or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses granted
+to You under this License for that Work shall terminate as of the date
+such litigation is filed.
+
+4. Redistribution.
+You may reproduce and distribute copies of the Work or Derivative Works
+thereof in any medium, with or without modifications, and in Source or
+Object form, provided that You meet the following conditions:
+
+  a. You must give any other recipients of the Work or Derivative Works
+     a copy of this License; and
+
+  b. You must cause any modified files to carry prominent notices stating
+     that You changed the files; and
+
+  c. You must retain, in the Source form of any Derivative Works that
+     You distribute, all copyright, patent, trademark, and attribution
+     notices from the Source form of the Work, excluding those notices
+     that do not pertain to any part of the Derivative Works; and
+
+  d. If the Work includes a "NOTICE" text file as part of its
+     distribution, then any Derivative Works that You distribute must
+     include a readable copy of the attribution notices contained
+     within such NOTICE file, excluding those notices that do not
+     pertain to any part of the Derivative Works, in at least one of
+     the following places: within a NOTICE text file distributed as part
+     of the Derivative Works; within the Source form or documentation,
+     if provided along with the Derivative Works; or, within a display
+     generated by the Derivative Works, if and wherever such third-party
+     notices normally appear. The contents of the NOTICE file are for
+     informational purposes only and do not modify the License. You
+     may add Your own attribution notices within Derivative Works that
+     You distribute, alongside or as an addendum to the NOTICE text
+     from the Work, provided that such additional attribution notices
+     cannot be construed as modifying the License.  You may add Your own
+     copyright statement to Your modifications and may provide additional
+     or different license terms and conditions for use, reproduction, or
+     distribution of Your modifications, or for any such Derivative Works
+     as a whole, provided Your use, reproduction, and distribution of the
+     Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions.
+Unless You explicitly state otherwise, any Contribution intentionally
+submitted for inclusion in the Work by You to the Licensor shall be
+under the terms and conditions of this License, without any additional
+terms or conditions.  Notwithstanding the above, nothing herein shall
+supersede or modify the terms of any separate license agreement you may
+have executed with Licensor regarding such Contributions.
+
+6. Trademarks.
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+Unless required by applicable law or agreed to in writing, Licensor
+provides the Work (and each Contributor provides its Contributions) on
+an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+express or implied, including, without limitation, any warranties or
+conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR
+A PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any risks
+associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability.
+In no event and under no legal theory, whether in tort (including
+negligence), contract, or otherwise, unless required by applicable law
+(such as deliberate and grossly negligent acts) or agreed to in writing,
+shall any Contributor be liable to You for damages, including any direct,
+indirect, special, incidental, or consequential damages of any character
+arising as a result of this License or out of the use or inability to
+use the Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all other
+commercial damages or losses), even if such Contributor has been advised
+of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+While redistributing the Work or Derivative Works thereof, You may
+choose to offer, and charge a fee for, acceptance of support, warranty,
+indemnity, or other liability obligations and/or rights consistent with
+this License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf of
+any other Contributor, and only if You agree to indemnify, defend, and
+hold each Contributor harmless for any liability incurred by, or claims
+asserted against, such Contributor by reason of your accepting any such
+warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/boltdb/bolt/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/boltdb/bolt/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/boltdb/bolt/LICENSE
rename to vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/boltdb/bolt/LICENSE
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/davecgh/go-spew/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/davecgh/go-spew/LICENSE
new file mode 100644
index 0000000000..2a7cfd2bf6
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/davecgh/go-spew/LICENSE
@@ -0,0 +1,13 @@
+Copyright (c) 2012-2013 Dave Collins <dave@davec.name>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/LICENSE
new file mode 100644
index 0000000000..c7a3f0cfd4
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/LICENSE
@@ -0,0 +1,191 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2013-2015 Docker, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/NOTICE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/NOTICE
new file mode 100644
index 0000000000..6e6f469ab9
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/NOTICE
@@ -0,0 +1,19 @@
+Docker
+Copyright 2012-2015 Docker, Inc.
+
+This product includes software developed at Docker, Inc. (https://www.docker.com).
+
+This product contains software (https://github.com/kr/pty) developed
+by Keith Rarick, licensed under the MIT License.
+
+The following is courtesy of our legal counsel:
+
+
+Use and transfer of Docker may be subject to certain restrictions by the
+United States and other governments.
+It is your responsibility to ensure that your use and/or transfer does not
+violate applicable laws.
+
+For more information, please see https://www.bis.doc.gov
+
+See also https://www.apache.org/dev/crypto.html and/or seek legal counsel.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/contrib/syntax/vim/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/contrib/syntax/vim/LICENSE
new file mode 100644
index 0000000000..e67cdabd22
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/contrib/syntax/vim/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2013 Honza Pokorny
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/docs/project/images/red_notice.png b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/docs/project/images/red_notice.png
new file mode 100644
index 0000000000..8839723a37
Binary files /dev/null and b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/docs/project/images/red_notice.png differ
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/pkg/mflag/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/pkg/mflag/LICENSE
new file mode 100644
index 0000000000..ac74d8f049
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/pkg/mflag/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014-2015 The Docker & Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.APACHE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.APACHE
new file mode 100644
index 0000000000..9e4bd4dbee
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.APACHE
@@ -0,0 +1,191 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2014-2015 Docker, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.BSD b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.BSD
new file mode 100644
index 0000000000..ac74d8f049
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/pkg/symlink/LICENSE.BSD
@@ -0,0 +1,27 @@
+Copyright (c) 2014-2015 The Docker & Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/pkg/transport/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/pkg/transport/LICENSE
new file mode 100644
index 0000000000..d02f24fd52
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/docker/pkg/transport/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 The oauth2 Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.code b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.code
new file mode 100644
index 0000000000..b55b37bc31
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.code
@@ -0,0 +1,191 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2015 Docker, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.docs b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.docs
new file mode 100644
index 0000000000..e26cd4fc8e
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/go-units/LICENSE.docs
@@ -0,0 +1,425 @@
+Attribution-ShareAlike 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+	wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More_considerations
+     for the public:
+	wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution-ShareAlike 4.0 International Public
+License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution-ShareAlike 4.0 International Public License ("Public
+License"). To the extent this Public License may be interpreted as a
+contract, You are granted the Licensed Rights in consideration of Your
+acceptance of these terms and conditions, and the Licensor grants You
+such rights in consideration of benefits the Licensor receives from
+making the Licensed Material available under these terms and
+conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. BY-SA Compatible License means a license listed at
+     creativecommons.org/compatiblelicenses, approved by Creative
+     Commons as essentially the equivalent of this Public License.
+
+  d. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  e. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  f. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  g. License Elements means the license attributes listed in the name
+     of a Creative Commons Public License. The License Elements of this
+     Public License are Attribution and ShareAlike.
+
+  h. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  i. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  j. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  k. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  l. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  m. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. Additional offer from the Licensor -- Adapted Material.
+               Every recipient of Adapted Material from You
+               automatically receives an offer from the Licensor to
+               exercise the Licensed Rights in the Adapted Material
+               under the conditions of the Adapter's License You apply.
+
+            c. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+  b. ShareAlike.
+
+     In addition to the conditions in Section 3(a), if You Share
+     Adapted Material You produce, the following conditions also apply.
+
+       1. The Adapter's License You apply must be a Creative Commons
+          license with the same License Elements, this version or
+          later, or a BY-SA Compatible License.
+
+       2. You must include the text of, or the URI or hyperlink to, the
+          Adapter's License You apply. You may satisfy this condition
+          in any reasonable manner based on the medium, means, and
+          context in which You Share Adapted Material.
+
+       3. You may not offer or impose any additional or different terms
+          or conditions on, or apply any Effective Technological
+          Measures to, Adapted Material that restrict exercise of the
+          rights granted under the Adapter's License You apply.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material,
+
+     including for purposes of Section 3(b); and
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public licenses.
+Notwithstanding, Creative Commons may elect to apply one of its public
+licenses to material it publishes and in those instances will be
+considered the "Licensor." Except for the limited purpose of indicating
+that material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the public
+licenses.
+
+Creative Commons may be contacted at creativecommons.org.
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/libcontainer/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/LICENSE
rename to vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/libcontainer/LICENSE
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/libcontainer/NOTICE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/libcontainer/NOTICE
new file mode 100644
index 0000000000..dc9129878c
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/docker/libcontainer/NOTICE
@@ -0,0 +1,16 @@
+libcontainer
+Copyright 2012-2015 Docker, Inc.
+
+This product includes software developed at Docker, Inc. (http://www.docker.com).
+
+The following is courtesy of our legal counsel:
+
+
+Use and transfer of Docker may be subject to certain restrictions by the
+United States and other governments.  
+It is your responsibility to ensure that your use and/or transfer does not
+violate applicable laws. 
+
+For more information, please see http://www.bis.doc.gov
+
+See also http://www.apache.org/dev/crypto.html and/or seek legal counsel.
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/bugsnag/bugsnag-go/LICENSE.txt b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/emicklei/go-restful/LICENSE
similarity index 89%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/bugsnag/bugsnag-go/LICENSE.txt
rename to vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/emicklei/go-restful/LICENSE
index 3cb0ec0fff..ece7ec61ef 100644
--- a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/bugsnag/bugsnag-go/LICENSE.txt
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/emicklei/go-restful/LICENSE
@@ -1,4 +1,6 @@
-Copyright (c) 2014 Bugsnag
+Copyright (c) 2012,2013 Ernest Micklei
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/ghodss/yaml/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/ghodss/yaml/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/ghodss/yaml/LICENSE
rename to vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/ghodss/yaml/LICENSE
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/gogo/protobuf/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/gogo/protobuf/LICENSE
rename to vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/gogo/protobuf/LICENSE
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/golang/glog/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/golang/glog/LICENSE
new file mode 100644
index 0000000000..37ec93a14f
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/golang/glog/LICENSE
@@ -0,0 +1,191 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/golang/groupcache/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/golang/groupcache/LICENSE
new file mode 100644
index 0000000000..37ec93a14f
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/golang/groupcache/LICENSE
@@ -0,0 +1,191 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE
similarity index 78%
rename from Godeps/_workspace/src/github.com/gorilla/mux/LICENSE
rename to vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE
index 0e5fb87280..1b1b1921ef 100644
--- a/Godeps/_workspace/src/github.com/gorilla/mux/LICENSE
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE
@@ -1,16 +1,19 @@
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
+Go support for Protocol Buffers - Google's data interchange format
+
+Copyright 2010 The Go Authors.  All rights reserved.
+https://github.com/golang/protobuf
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-	 * Redistributions of source code must retain the above copyright
+    * Redistributions of source code must retain the above copyright
 notice, this list of conditions and the following disclaimer.
-	 * Redistributions in binary form must reproduce the above
+    * Redistributions in binary form must reproduce the above
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-	 * Neither the name of Google Inc. nor the names of its
+    * Neither the name of Google Inc. nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
@@ -25,3 +28,4 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/golang/snappy/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/golang/snappy/LICENSE
new file mode 100644
index 0000000000..6050c10f4c
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/golang/snappy/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2011 The Snappy-Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/google/cadvisor/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/google/cadvisor/LICENSE
new file mode 100644
index 0000000000..97cec18e87
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/google/cadvisor/LICENSE
@@ -0,0 +1,190 @@
+   Copyright 2014 The cAdvisor Authors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/google/gofuzz/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/google/gofuzz/LICENSE
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/google/gofuzz/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/LICENSE
new file mode 100644
index 0000000000..ccae99f6a9
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2012, 2013 Ugorji Nwoke.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the name of the author nor the names of its contributors may be used
+  to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/LICENSE
new file mode 100644
index 0000000000..f0e5c79e18
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/LICENSE
@@ -0,0 +1,362 @@
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. "Contributor"
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+
+     means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the terms of
+        a Secondary License.
+
+1.6. "Executable Form"
+
+     means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+
+     means a work that combines Covered Software with other material, in a
+     separate file or files, that is not Covered Software.
+
+1.8. "License"
+
+     means this document.
+
+1.9. "Licensable"
+
+     means having the right to grant, to the maximum extent possible, whether
+     at the time of the initial grant or subsequently, any and all of the
+     rights conveyed by this License.
+
+1.10. "Modifications"
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. "Patent Claims" of a Contributor
+
+      means any patent claim(s), including without limitation, method,
+      process, and apparatus claims, in any patent Licensable by such
+      Contributor that would be infringed, but for the grant of the License,
+      by the making, using, selling, offering for sale, having made, import,
+      or transfer of either its Contributions or its Contributor Version.
+
+1.12. "Secondary License"
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. "Source Code Form"
+
+      means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, "You" includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, "control" means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or
+        as part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its
+        Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution
+     become effective for each Contribution on the date the Contributor first
+     distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under
+     this License. No additional rights or licenses will be implied from the
+     distribution or licensing of Covered Software under this License.
+     Notwithstanding Section 2.1(b) above, no patent license is granted by a
+     Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party's
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of
+        its Contributions.
+
+     This License does not grant any rights in the trademarks, service marks,
+     or logos of any Contributor (except as may be necessary to comply with
+     the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this
+     License (see Section 10.2) or under the terms of a Secondary License (if
+     permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its
+     Contributions are its original creation(s) or it has sufficient rights to
+     grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under
+     applicable copyright doctrines of fair use, fair dealing, or other
+     equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under
+     the terms of this License. You must inform recipients that the Source
+     Code Form of the Covered Software is governed by the terms of this
+     License, and how they can obtain a copy of this License. You may not
+     attempt to alter or restrict the recipients' rights in the Source Code
+     Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this
+        License, or sublicense it under different terms, provided that the
+        license for the Executable Form does not attempt to limit or alter the
+        recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for
+     the Covered Software. If the Larger Work is a combination of Covered
+     Software with a work governed by one or more Secondary Licenses, and the
+     Covered Software is not Incompatible With Secondary Licenses, this
+     License permits You to additionally distribute such Covered Software
+     under the terms of such Secondary License(s), so that the recipient of
+     the Larger Work may, at their option, further distribute the Covered
+     Software under the terms of either this License or such Secondary
+     License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices
+     (including copyright notices, patent notices, disclaimers of warranty, or
+     limitations of liability) contained within the Source Code Form of the
+     Covered Software, except that You may alter any license notices to the
+     extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on
+     behalf of any Contributor. You must make it absolutely clear that any
+     such warranty, support, indemnity, or liability obligation is offered by
+     You alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute,
+   judicial order, or regulation then You must: (a) comply with the terms of
+   this License to the maximum extent possible; and (b) describe the
+   limitations and the code they affect. Such description must be placed in a
+   text file included with all distributions of the Covered Software under
+   this License. Except to the extent prohibited by statute or regulation,
+   such description must be sufficiently detailed for a recipient of ordinary
+   skill to be able to understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing
+     basis, if such Contributor fails to notify You of the non-compliance by
+     some reasonable means prior to 60 days after You have come back into
+     compliance. Moreover, Your grants from a particular Contributor are
+     reinstated on an ongoing basis if such Contributor notifies You of the
+     non-compliance by some reasonable means, this is the first time You have
+     received notice of non-compliance with this License from such
+     Contributor, and You become compliant prior to 30 days after Your receipt
+     of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions,
+     counter-claims, and cross-claims) alleging that a Contributor Version
+     directly or indirectly infringes any patent, then the rights granted to
+     You by any and all Contributors for the Covered Software under Section
+     2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an "as is" basis,
+   without warranty of any kind, either expressed, implied, or statutory,
+   including, without limitation, warranties that the Covered Software is free
+   of defects, merchantable, fit for a particular purpose or non-infringing.
+   The entire risk as to the quality and performance of the Covered Software
+   is with You. Should any Covered Software prove defective in any respect,
+   You (not any Contributor) assume the cost of any necessary servicing,
+   repair, or correction. This disclaimer of warranty constitutes an essential
+   part of this License. No use of  any Covered Software is authorized under
+   this License except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from
+   such party's negligence to the extent applicable law prohibits such
+   limitation. Some jurisdictions do not allow the exclusion or limitation of
+   incidental or consequential damages, so this exclusion and limitation may
+   not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts
+   of a jurisdiction where the defendant maintains its principal place of
+   business and such litigation shall be governed by laws of that
+   jurisdiction, without reference to its conflict-of-law provisions. Nothing
+   in this Section shall prevent a party's ability to bring cross-claims or
+   counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject
+   matter hereof. If any provision of this License is held to be
+   unenforceable, such provision shall be reformed only to the extent
+   necessary to make it enforceable. Any law or regulation which provides that
+   the language of a contract shall be construed against the drafter shall not
+   be used to construe this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version
+      of the License under which You originally received the Covered Software,
+      or under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a
+      modified version of this License if you rename the license and remove
+      any references to the name of the license steward (except to note that
+      such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+      Licenses If You choose to distribute Source Code Form that is
+      Incompatible With Secondary Licenses under the terms of this version of
+      the License, the notice described in Exhibit B of this License must be
+      attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file,
+then You may include the notice in a location (such as a LICENSE file in a
+relevant directory) where a recipient would be likely to look for such a
+notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+
+      This Source Code Form is "Incompatible
+      With Secondary Licenses", as defined by
+      the Mozilla Public License, v. 2.0.
\ No newline at end of file
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/hashicorp/raft/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/hashicorp/raft/LICENSE
new file mode 100644
index 0000000000..c33dcc7c92
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/hashicorp/raft/LICENSE
@@ -0,0 +1,354 @@
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. “Contributor”
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. “Contributor Version”
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor’s Contribution.
+
+1.3. “Contribution”
+
+     means Covered Software of a particular Contributor.
+
+1.4. “Covered Software”
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. “Incompatible With Secondary Licenses”
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of version
+        1.1 or earlier of the License, but not also under the terms of a
+        Secondary License.
+
+1.6. “Executable Form”
+
+     means any form of the work other than Source Code Form.
+
+1.7. “Larger Work”
+
+     means a work that combines Covered Software with other material, in a separate
+     file or files, that is not Covered Software.
+
+1.8. “License”
+
+     means this document.
+
+1.9. “Licensable”
+
+     means having the right to grant, to the maximum extent possible, whether at the
+     time of the initial grant or subsequently, any and all of the rights conveyed by
+     this License.
+
+1.10. “Modifications”
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to, deletion
+        from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. “Patent Claims” of a Contributor
+
+      means any patent claim(s), including without limitation, method, process,
+      and apparatus claims, in any patent Licensable by such Contributor that
+      would be infringed, but for the grant of the License, by the making,
+      using, selling, offering for sale, having made, import, or transfer of
+      either its Contributions or its Contributor Version.
+
+1.12. “Secondary License”
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. “Source Code Form”
+
+      means the form of the work preferred for making modifications.
+
+1.14. “You” (or “Your”)
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, “You” includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, “control” means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or as
+        part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its Contributions
+        or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution become
+     effective for each Contribution on the date the Contributor first distributes
+     such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under this
+     License. No additional rights or licenses will be implied from the distribution
+     or licensing of Covered Software under this License. Notwithstanding Section
+     2.1(b) above, no patent license is granted by a Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party’s
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of its
+        Contributions.
+
+     This License does not grant any rights in the trademarks, service marks, or
+     logos of any Contributor (except as may be necessary to comply with the
+     notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this License
+     (see Section 10.2) or under the terms of a Secondary License (if permitted
+     under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its Contributions
+     are its original creation(s) or it has sufficient rights to grant the
+     rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under applicable
+     copyright doctrines of fair use, fair dealing, or other equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under the
+     terms of this License. You must inform recipients that the Source Code Form
+     of the Covered Software is governed by the terms of this License, and how
+     they can obtain a copy of this License. You may not attempt to alter or
+     restrict the recipients’ rights in the Source Code Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this License,
+        or sublicense it under different terms, provided that the license for
+        the Executable Form does not attempt to limit or alter the recipients’
+        rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for the
+     Covered Software. If the Larger Work is a combination of Covered Software
+     with a work governed by one or more Secondary Licenses, and the Covered
+     Software is not Incompatible With Secondary Licenses, this License permits
+     You to additionally distribute such Covered Software under the terms of
+     such Secondary License(s), so that the recipient of the Larger Work may, at
+     their option, further distribute the Covered Software under the terms of
+     either this License or such Secondary License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices (including
+     copyright notices, patent notices, disclaimers of warranty, or limitations
+     of liability) contained within the Source Code Form of the Covered
+     Software, except that You may alter any license notices to the extent
+     required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on behalf
+     of any Contributor. You must make it absolutely clear that any such
+     warranty, support, indemnity, or liability obligation is offered by You
+     alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute, judicial
+   order, or regulation then You must: (a) comply with the terms of this License
+   to the maximum extent possible; and (b) describe the limitations and the code
+   they affect. Such description must be placed in a text file included with all
+   distributions of the Covered Software under this License. Except to the
+   extent prohibited by statute or regulation, such description must be
+   sufficiently detailed for a recipient of ordinary skill to be able to
+   understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
+     if such Contributor fails to notify You of the non-compliance by some
+     reasonable means prior to 60 days after You have come back into compliance.
+     Moreover, Your grants from a particular Contributor are reinstated on an
+     ongoing basis if such Contributor notifies You of the non-compliance by
+     some reasonable means, this is the first time You have received notice of
+     non-compliance with this License from such Contributor, and You become
+     compliant prior to 30 days after Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions, counter-claims,
+     and cross-claims) alleging that a Contributor Version directly or
+     indirectly infringes any patent, then the rights granted to You by any and
+     all Contributors for the Covered Software under Section 2.1 of this License
+     shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an “as is” basis, without
+   warranty of any kind, either expressed, implied, or statutory, including,
+   without limitation, warranties that the Covered Software is free of defects,
+   merchantable, fit for a particular purpose or non-infringing. The entire
+   risk as to the quality and performance of the Covered Software is with You.
+   Should any Covered Software prove defective in any respect, You (not any
+   Contributor) assume the cost of any necessary servicing, repair, or
+   correction. This disclaimer of warranty constitutes an essential part of this
+   License. No use of  any Covered Software is authorized under this License
+   except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from such
+   party’s negligence to the extent applicable law prohibits such limitation.
+   Some jurisdictions do not allow the exclusion or limitation of incidental or
+   consequential damages, so this exclusion and limitation may not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts of
+   a jurisdiction where the defendant maintains its principal place of business
+   and such litigation shall be governed by laws of that jurisdiction, without
+   reference to its conflict-of-law provisions. Nothing in this Section shall
+   prevent a party’s ability to bring cross-claims or counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject matter
+   hereof. If any provision of this License is held to be unenforceable, such
+   provision shall be reformed only to the extent necessary to make it
+   enforceable. Any law or regulation which provides that the language of a
+   contract shall be construed against the drafter shall not be used to construe
+   this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version of
+      the License under which You originally received the Covered Software, or
+      under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a modified
+      version of this License if you rename the license and remove any
+      references to the name of the license steward (except to note that such
+      modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
+      If You choose to distribute Source Code Form that is Incompatible With
+      Secondary Licenses under the terms of this version of the License, the
+      notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file, then
+You may include the notice in a location (such as a LICENSE file in a relevant
+directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - “Incompatible With Secondary Licenses” Notice
+
+      This Source Code Form is “Incompatible
+      With Secondary Licenses”, as defined by
+      the Mozilla Public License, v. 2.0.
+
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/hawkular/hawkular-client-go/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/hawkular/hawkular-client-go/LICENSE
new file mode 100644
index 0000000000..8f71f43fee
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/hawkular/hawkular-client-go/LICENSE
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/imdario/mergo/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/imdario/mergo/LICENSE
new file mode 100644
index 0000000000..686680298d
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/imdario/mergo/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2013 Dario Castañé. All rights reserved.
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE
new file mode 100644
index 0000000000..d50222706c
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-2015 Errplane Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/juju/ratelimit/LICENSE
similarity index 96%
rename from Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE
rename to vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/juju/ratelimit/LICENSE
index a68e67f01b..ade9307b39 100644
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/juju/ratelimit/LICENSE
@@ -1,5 +1,8 @@
+All files in this repository are licensed as follows. If you contribute
+to this repository, it is assumed that you license your contribution
+under the same license unless you state otherwise.
 
-Copyright (c) 2011-2014 - Canonical Inc.
+All files Copyright (C) 2015 Canonical Ltd. unless otherwise specified in the file.
 
 This software is licensed under the LGPLv3, included below.
 
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/LICENSE
new file mode 100644
index 0000000000..13f15dfce0
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2013 Matt T. Proud
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/mitchellh/mapstructure/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/mitchellh/mapstructure/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/github.com/mitchellh/mapstructure/LICENSE
rename to vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/mitchellh/mapstructure/LICENSE
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/opencontainers/runc/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/opencontainers/runc/LICENSE
new file mode 100644
index 0000000000..27448585ad
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/opencontainers/runc/LICENSE
@@ -0,0 +1,191 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2014 Docker, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/opencontainers/runc/NOTICE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/opencontainers/runc/NOTICE
new file mode 100644
index 0000000000..5c97abce4b
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/opencontainers/runc/NOTICE
@@ -0,0 +1,17 @@
+runc
+
+Copyright 2012-2015 Docker, Inc.
+
+This product includes software developed at Docker, Inc. (http://www.docker.com).
+
+The following is courtesy of our legal counsel:
+
+
+Use and transfer of Docker may be subject to certain restrictions by the
+United States and other governments.  
+It is your responsibility to ensure that your use and/or transfer does not
+violate applicable laws. 
+
+For more information, please see http://www.bis.doc.gov
+
+See also http://www.apache.org/dev/crypto.html and/or seek legal counsel.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/optiopay/kafka/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/optiopay/kafka/LICENSE
new file mode 100644
index 0000000000..caa1f3baf9
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/optiopay/kafka/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015 Optiopay
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE
new file mode 100644
index 0000000000..5dc68268d9
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009,2014 Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/pmezard/go-difflib/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/pmezard/go-difflib/LICENSE
new file mode 100644
index 0000000000..c67dad612a
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/pmezard/go-difflib/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2013, Patrick Mezard
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+    The names of its contributors may not be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/client_golang/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/client_golang/LICENSE
new file mode 100644
index 0000000000..261eeb9e9f
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/client_golang/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/client_golang/NOTICE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/client_golang/NOTICE
new file mode 100644
index 0000000000..37e4a7d410
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/client_golang/NOTICE
@@ -0,0 +1,28 @@
+Prometheus instrumentation library for Go applications
+Copyright 2012-2015 The Prometheus Authors
+
+This product includes software developed at
+SoundCloud Ltd. (http://soundcloud.com/).
+
+
+The following components are included in this product:
+
+goautoneg
+http://bitbucket.org/ww/goautoneg
+Copyright 2011, Open Knowledge Foundation Ltd.
+See README.txt for license details.
+
+perks - a fork of https://github.com/bmizerany/perks
+https://github.com/beorn7/perks
+Copyright 2013-2015 Blake Mizerany, Björn Rabenstein
+See https://github.com/beorn7/perks/blob/master/README.md for license details.
+
+Go support for Protocol Buffers - Google's data interchange format
+http://github.com/golang/protobuf/
+Copyright 2010 The Go Authors
+See source code for license details.
+
+Support for streaming Protocol Buffer messages for the Go language (golang).
+https://github.com/matttproud/golang_protobuf_extensions
+Copyright 2013 Matt T. Proud
+Licensed under the Apache License, Version 2.0
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/client_model/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/client_model/LICENSE
new file mode 100644
index 0000000000..261eeb9e9f
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/client_model/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/client_model/NOTICE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/client_model/NOTICE
new file mode 100644
index 0000000000..20110e410e
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/client_model/NOTICE
@@ -0,0 +1,5 @@
+Data model artifacts for Prometheus.
+Copyright 2012-2015 The Prometheus Authors
+
+This product includes software developed at
+SoundCloud Ltd. (http://soundcloud.com/).
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/client_model/ruby/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/client_model/ruby/LICENSE
new file mode 100644
index 0000000000..11069edd79
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/client_model/ruby/LICENSE
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/procfs/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/procfs/LICENSE
new file mode 100644
index 0000000000..261eeb9e9f
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/procfs/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/procfs/NOTICE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/procfs/NOTICE
new file mode 100644
index 0000000000..53c5e9aa11
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/prometheus/procfs/NOTICE
@@ -0,0 +1,7 @@
+procfs provides functions to retrieve system, kernel and process
+metrics from the pseudo-filesystem proc.
+
+Copyright 2014-2015 The Prometheus Authors
+
+This product includes software developed at
+SoundCloud Ltd. (http://soundcloud.com/).
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/rackspace/gophercloud/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/rackspace/gophercloud/LICENSE
new file mode 100644
index 0000000000..fbbbc9e4cb
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/rackspace/gophercloud/LICENSE
@@ -0,0 +1,191 @@
+Copyright 2012-2013 Rackspace, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License.  You may obtain a copy of the
+License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations under the License.                                
+
+------
+ 
+				Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE
new file mode 100644
index 0000000000..63ed1cfea1
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2012 Alex Ogier. All rights reserved.
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md
new file mode 100644
index 0000000000..2199945813
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md
@@ -0,0 +1,23 @@
+objx - by Mat Ryer and Tyler Bunnell
+
+The MIT License (MIT)
+
+Copyright (c) 2014 Stretchr, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/stretchr/testify/LICENCE.txt b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/stretchr/testify/LICENCE.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/coreos/etcd/cmd/vendor/github.com/stretchr/testify/LICENCE.txt
rename to vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/stretchr/testify/LICENCE.txt
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/stretchr/testify/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/stretchr/testify/LICENSE
new file mode 100644
index 0000000000..473b670a7c
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/stretchr/testify/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2012 - 2013 Mat Ryer and Tyler Bunnell
+
+Please consider promoting this project if you find it useful.
+
+Permission is hereby granted, free of charge, to any person 
+obtaining a copy of this software and associated documentation 
+files (the "Software"), to deal in the Software without restriction, 
+including without limitation the rights to use, copy, modify, merge, 
+publish, distribute, sublicense, and/or sell copies of the Software, 
+and to permit persons to whom the Software is furnished to do so, 
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT 
+OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/ugorji/go/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/ugorji/go/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/ugorji/go/LICENSE
rename to vendor/k8s.io/heapster/Godeps/_workspace/src/github.com/ugorji/go/LICENSE
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/golang.org/x/crypto/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/golang.org/x/crypto/LICENSE
new file mode 100644
index 0000000000..6a66aea5ea
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/golang.org/x/crypto/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/golang.org/x/crypto/PATENTS b/vendor/k8s.io/heapster/Godeps/_workspace/src/golang.org/x/crypto/PATENTS
new file mode 100644
index 0000000000..733099041f
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/golang.org/x/crypto/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Go project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/golang.org/x/net/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/golang.org/x/net/LICENSE
new file mode 100644
index 0000000000..6a66aea5ea
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/golang.org/x/net/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/golang.org/x/net/PATENTS b/vendor/k8s.io/heapster/Godeps/_workspace/src/golang.org/x/net/PATENTS
new file mode 100644
index 0000000000..733099041f
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/golang.org/x/net/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Go project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/golang.org/x/oauth2/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/golang.org/x/oauth2/LICENSE
new file mode 100644
index 0000000000..d02f24fd52
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/golang.org/x/oauth2/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 The oauth2 Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/google.golang.org/api/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/google.golang.org/api/LICENSE
new file mode 100644
index 0000000000..263aa7a0c1
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/google.golang.org/api/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2011 Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE
new file mode 100644
index 0000000000..de9c88cb65
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE
@@ -0,0 +1,18 @@
+Copyright (c) 2013 Joshua Tacoma
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/google.golang.org/appengine/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/google.golang.org/appengine/LICENSE
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/google.golang.org/appengine/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/google.golang.org/cloud/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/google.golang.org/cloud/LICENSE
new file mode 100644
index 0000000000..a4c5efd822
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/google.golang.org/cloud/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2014 Google Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/gopkg.in/yaml.v2/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/gopkg.in/v2/yaml/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/gopkg.in/yaml.v2/LICENSE
rename to vendor/k8s.io/heapster/Godeps/_workspace/src/gopkg.in/v2/yaml/LICENSE
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/vendor/gopkg.in/yaml.v2/LICENSE.libyaml b/vendor/k8s.io/heapster/Godeps/_workspace/src/gopkg.in/v2/yaml/LICENSE.libyaml
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/distribution/vendor/gopkg.in/yaml.v2/LICENSE.libyaml
rename to vendor/k8s.io/heapster/Godeps/_workspace/src/gopkg.in/v2/yaml/LICENSE.libyaml
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/Godeps/LICENSES.md b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/Godeps/LICENSES.md
new file mode 100644
index 0000000000..448927f8de
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/Godeps/LICENSES.md
@@ -0,0 +1,110 @@
+Dependency Licenses
+-------------------
+
+Package | License
+------- | -------
+bitbucket.org/bertimus9/systemstat | MITname
+bitbucket.org/ww/goautoneg | spdxBSD3
+github.com/abbot/go-http-auth | Apache-2
+github.com/appc/cni | Apache-2
+github.com/appc/spec | Apache-2
+github.com/armon/go-metrics | MITname
+github.com/aws/aws-sdk-go | Apache-2
+github.com/beorn7/perks/quantile | MIT?
+github.com/blang/semver | MITname
+github.com/boltdb/bolt | MITname
+github.com/camlistore/go4 | Apache-2
+github.com/ClusterHQ/flocker-go | UNKNOWN
+github.com/codegangsta/negroni | MITname
+github.com/coreos/etcd | Apache-2
+github.com/coreos/go-etcd | Apache-2
+github.com/coreos/go-oidc | Apache-2
+github.com/coreos/go-semver | Apache-2
+github.com/coreos/go-systemd | Apache-2
+github.com/coreos/pkg | Apache-2
+github.com/coreos/rkt | MITname
+github.com/cpuguy83/go-md2man | MITname
+github.com/davecgh/go-spew | MIToldwithoutSellandNoDocumentationRequi
+github.com/daviddengcn/go-colortext | BSD?
+github.com/dgrijalva/jwt-go | spdxMIT
+github.com/docker/docker | Apache-2
+github.com/docker/docker/pkg/symlink | spdxBSD3
+github.com/docker/go-units | Apache-2
+github.com/docker/spdystream | SeeFile
+github.com/elazarl/go-bindata-assetfs | spdxBSD2
+github.com/elazarl/goproxy | BSDWarr
+github.com/emicklei/go-restful | MITname
+github.com/evanphx/json-patch | BSDWarr
+github.com/fsouza/go-dockerclient | spdxBSD2
+github.com/garyburd/redigo/internal | ApachesPermLim
+github.com/garyburd/redigo/redis | ApachesPermLim
+github.com/ghodss/yaml | MITname
+github.com/go-ini/ini | Apache-2
+github.com/godbus/dbus | spdxBSD2
+github.com/gogo/protobuf | spdxBSD3
+github.com/golang/glog | Apache-2
+github.com/golang/groupcache | Apache-2
+github.com/golang/protobuf | spdxBSD3
+github.com/google/btree | Apache-2
+github.com/google/cadvisor | Apache-2
+github.com/google/gofuzz | Apache-2
+github.com/gorilla/context | spdxBSD3
+github.com/gorilla/mux | spdxBSD3
+github.com/hashicorp/go-msgpack | spdxBSD3
+github.com/hashicorp/raft | IntelPart08
+github.com/hashicorp/raft-boltdb | IntelPart08
+github.com/imdario/mergo | spdxBSD3
+github.com/inconshreveable/mousetrap | Apache-2
+github.com/influxdb/influxdb | MITname
+github.com/jmespath/go-jmespath | Apache-2
+github.com/jonboulle/clockwork | Apache-2
+github.com/juju/ratelimit | LesserExceptionGPLVer3-TOOLONG
+github.com/kardianos/osext | spdxBSD3
+github.com/kr/pty | spdxMIT
+github.com/matttproud/golang_protobuf_extensions | Apache-2
+github.com/mesos/mesos-go | Apache-2
+github.com/miekg/dns | spdxBSD3
+github.com/mistifyio/go-zfs | Apache-2
+github.com/mitchellh/mapstructure | MITname
+github.com/mvdan/xurls | spdxBSD3
+github.com/mxk/go-flowrate | spdxBSD3
+github.com/onsi/ginkgo | spdxMIT
+github.com/onsi/gomega | spdxMIT
+github.com/opencontainers/runc | Apache-2
+github.com/pborman/uuid | spdxBSD3
+github.com/pmezard/go-difflib | BSD3
+github.com/prometheus/client_golang | Apache-2
+github.com/prometheus/client_model | Apache-2
+github.com/prometheus/common/expfmt | Apache-2
+github.com/prometheus/common/model | Apache-2
+github.com/prometheus/procfs | Apache-2
+github.com/rackspace/gophercloud | Apache-2
+github.com/russross/blackfriday | AsIsVariant2-TOOLONG
+github.com/samuel/go-zookeeper | spdxBSD3
+github.com/scalingdata/gcfg | spdxBSD2
+github.com/seccomp/libseccomp-golang | AllRights-TOOLONG
+github.com/shurcooL/sanitized_anchor_name | MIT?
+github.com/Sirupsen/logrus | MITname
+github.com/skynetservices/skydns | MITname
+github.com/spf13/cobra | Apache-2
+github.com/spf13/pflag | spdxBSD3
+github.com/stretchr/objx | MIT?
+github.com/stretchr/testify | spdxMIT
+github.com/syndtr/gocapability | spdxBSD2
+github.com/ugorji/go | MITname
+github.com/vishvananda/netlink | Apache-2
+github.com/xiang90/probing | MITname
+github.com/xyproto/simpleredis | MITname
+golang.org/x/crypto | spdxBSD3
+golang.org/x/exp | spdxBSD3
+golang.org/x/net | spdxBSD3
+golang.org/x/oauth2 | spdxBSD3
+golang.org/x/sys | spdxBSD3
+golang.org/x/tools | spdxBSD3
+google.golang.org/api | spdxBSD3
+google.golang.org/cloud | Apache-2
+google.golang.org/grpc | spdxBSD3
+gopkg.in/natefinch/lumberjack.v2 | MITname
+gopkg.in/yaml.v2 | LesserExceptionGPLVer3-TOOLONG
+k8s.io/heapster | Apache-2
+speter.net/go/exp/math/dec/inf | spdxBSD2
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/LICENSE
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/cluster/juju/charms/trusty/kubernetes-master/copyright
similarity index 83%
rename from Godeps/_workspace/src/github.com/inconshreveable/mousetrap/LICENSE
rename to vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/cluster/juju/charms/trusty/kubernetes-master/copyright
index 5f0d1fb6a7..a0b409a8e8 100644
--- a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/LICENSE
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/cluster/juju/charms/trusty/kubernetes-master/copyright
@@ -1,10 +1,10 @@
-Copyright 2014 Alan Shreve
+Copyright 2015 Google Inc. All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-   http://www.apache.org/licenses/LICENSE-2.0
+     http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/cluster/juju/charms/trusty/kubernetes/copyright b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/cluster/juju/charms/trusty/kubernetes/copyright
new file mode 100644
index 0000000000..a0b409a8e8
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/cluster/juju/charms/trusty/kubernetes/copyright
@@ -0,0 +1,13 @@
+Copyright 2015 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/docs/user-guide/update-demo/local/LICENSE.angular b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/docs/user-guide/update-demo/local/LICENSE.angular
new file mode 100644
index 0000000000..020f87acd2
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/docs/user-guide/update-demo/local/LICENSE.angular
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2010-2014 Google, Inc. http://angularjs.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/pkg/client/typed/generated/extensions/v1beta1/thirdpartyresource.go b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/pkg/client/typed/generated/extensions/v1beta1/thirdpartyresource.go
new file mode 100644
index 0000000000..cfd128dc3c
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/pkg/client/typed/generated/extensions/v1beta1/thirdpartyresource.go
@@ -0,0 +1,136 @@
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta1
+
+import (
+	api "k8s.io/kubernetes/pkg/api"
+	v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
+	watch "k8s.io/kubernetes/pkg/watch"
+)
+
+// ThirdPartyResourcesGetter has a method to return a ThirdPartyResourceInterface.
+// A group's client should implement this interface.
+type ThirdPartyResourcesGetter interface {
+	ThirdPartyResources(namespace string) ThirdPartyResourceInterface
+}
+
+// ThirdPartyResourceInterface has methods to work with ThirdPartyResource resources.
+type ThirdPartyResourceInterface interface {
+	Create(*v1beta1.ThirdPartyResource) (*v1beta1.ThirdPartyResource, error)
+	Update(*v1beta1.ThirdPartyResource) (*v1beta1.ThirdPartyResource, error)
+	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
+	Get(name string) (*v1beta1.ThirdPartyResource, error)
+	List(opts api.ListOptions) (*v1beta1.ThirdPartyResourceList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
+	ThirdPartyResourceExpansion
+}
+
+// thirdPartyResources implements ThirdPartyResourceInterface
+type thirdPartyResources struct {
+	client *ExtensionsClient
+	ns     string
+}
+
+// newThirdPartyResources returns a ThirdPartyResources
+func newThirdPartyResources(c *ExtensionsClient, namespace string) *thirdPartyResources {
+	return &thirdPartyResources{
+		client: c,
+		ns:     namespace,
+	}
+}
+
+// Create takes the representation of a thirdPartyResource and creates it.  Returns the server's representation of the thirdPartyResource, and an error, if there is any.
+func (c *thirdPartyResources) Create(thirdPartyResource *v1beta1.ThirdPartyResource) (result *v1beta1.ThirdPartyResource, err error) {
+	result = &v1beta1.ThirdPartyResource{}
+	err = c.client.Post().
+		Namespace(c.ns).
+		Resource("thirdpartyresources").
+		Body(thirdPartyResource).
+		Do().
+		Into(result)
+	return
+}
+
+// Update takes the representation of a thirdPartyResource and updates it. Returns the server's representation of the thirdPartyResource, and an error, if there is any.
+func (c *thirdPartyResources) Update(thirdPartyResource *v1beta1.ThirdPartyResource) (result *v1beta1.ThirdPartyResource, err error) {
+	result = &v1beta1.ThirdPartyResource{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("thirdpartyresources").
+		Name(thirdPartyResource.Name).
+		Body(thirdPartyResource).
+		Do().
+		Into(result)
+	return
+}
+
+// Delete takes name of the thirdPartyResource and deletes it. Returns an error if one occurs.
+func (c *thirdPartyResources) Delete(name string, options *api.DeleteOptions) error {
+	return c.client.Delete().
+		Namespace(c.ns).
+		Resource("thirdpartyresources").
+		Name(name).
+		Body(options).
+		Do().
+		Error()
+}
+
+// DeleteCollection deletes a collection of objects.
+func (c *thirdPartyResources) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	return c.client.Delete().
+		Namespace(c.ns).
+		Resource("thirdpartyresources").
+		VersionedParams(&listOptions, api.ParameterCodec).
+		Body(options).
+		Do().
+		Error()
+}
+
+// Get takes name of the thirdPartyResource, and returns the corresponding thirdPartyResource object, and an error if there is any.
+func (c *thirdPartyResources) Get(name string) (result *v1beta1.ThirdPartyResource, err error) {
+	result = &v1beta1.ThirdPartyResource{}
+	err = c.client.Get().
+		Namespace(c.ns).
+		Resource("thirdpartyresources").
+		Name(name).
+		Do().
+		Into(result)
+	return
+}
+
+// List takes label and field selectors, and returns the list of ThirdPartyResources that match those selectors.
+func (c *thirdPartyResources) List(opts api.ListOptions) (result *v1beta1.ThirdPartyResourceList, err error) {
+	result = &v1beta1.ThirdPartyResourceList{}
+	err = c.client.Get().
+		Namespace(c.ns).
+		Resource("thirdpartyresources").
+		VersionedParams(&opts, api.ParameterCodec).
+		Do().
+		Into(result)
+	return
+}
+
+// Watch returns a watch.Interface that watches the requested thirdPartyResources.
+func (c *thirdPartyResources) Watch(opts api.ListOptions) (watch.Interface, error) {
+	return c.client.Get().
+		Prefix("watch").
+		Namespace(c.ns).
+		Resource("thirdpartyresources").
+		VersionedParams(&opts, api.ParameterCodec).
+		Watch()
+}
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/pkg/client/unversioned/thirdpartyresources.go b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/pkg/client/unversioned/thirdpartyresources.go
new file mode 100644
index 0000000000..09bc4e4afc
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/pkg/client/unversioned/thirdpartyresources.go
@@ -0,0 +1,100 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package unversioned
+
+import (
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/kubernetes/pkg/watch"
+)
+
+// ThirdPartyResourceNamespacer has methods to work with ThirdPartyResource resources in a namespace
+type ThirdPartyResourceNamespacer interface {
+	ThirdPartyResources(namespace string) ThirdPartyResourceInterface
+}
+
+type ThirdPartyResourceInterface interface {
+	List(opts api.ListOptions) (*extensions.ThirdPartyResourceList, error)
+	Get(name string) (*extensions.ThirdPartyResource, error)
+	Create(ctrl *extensions.ThirdPartyResource) (*extensions.ThirdPartyResource, error)
+	Update(ctrl *extensions.ThirdPartyResource) (*extensions.ThirdPartyResource, error)
+	UpdateStatus(ctrl *extensions.ThirdPartyResource) (*extensions.ThirdPartyResource, error)
+	Delete(name string) error
+	Watch(opts api.ListOptions) (watch.Interface, error)
+}
+
+// thirdPartyResources implements DaemonsSetsNamespacer interface
+type thirdPartyResources struct {
+	r  *ExtensionsClient
+	ns string
+}
+
+func newThirdPartyResources(c *ExtensionsClient, namespace string) *thirdPartyResources {
+	return &thirdPartyResources{c, namespace}
+}
+
+// Ensure statically that thirdPartyResources implements ThirdPartyResourcesInterface.
+var _ ThirdPartyResourceInterface = &thirdPartyResources{}
+
+func (c *thirdPartyResources) List(opts api.ListOptions) (result *extensions.ThirdPartyResourceList, err error) {
+	result = &extensions.ThirdPartyResourceList{}
+	err = c.r.Get().Namespace(c.ns).Resource("thirdpartyresources").VersionedParams(&opts, api.ParameterCodec).Do().Into(result)
+	return
+}
+
+// Get returns information about a particular third party resource.
+func (c *thirdPartyResources) Get(name string) (result *extensions.ThirdPartyResource, err error) {
+	result = &extensions.ThirdPartyResource{}
+	err = c.r.Get().Namespace(c.ns).Resource("thirdpartyresources").Name(name).Do().Into(result)
+	return
+}
+
+// Create creates a new third party resource.
+func (c *thirdPartyResources) Create(resource *extensions.ThirdPartyResource) (result *extensions.ThirdPartyResource, err error) {
+	result = &extensions.ThirdPartyResource{}
+	err = c.r.Post().Namespace(c.ns).Resource("thirdpartyresources").Body(resource).Do().Into(result)
+	return
+}
+
+// Update updates an existing third party resource.
+func (c *thirdPartyResources) Update(resource *extensions.ThirdPartyResource) (result *extensions.ThirdPartyResource, err error) {
+	result = &extensions.ThirdPartyResource{}
+	err = c.r.Put().Namespace(c.ns).Resource("thirdpartyresources").Name(resource.Name).Body(resource).Do().Into(result)
+	return
+}
+
+// UpdateStatus updates an existing third party resource status
+func (c *thirdPartyResources) UpdateStatus(resource *extensions.ThirdPartyResource) (result *extensions.ThirdPartyResource, err error) {
+	result = &extensions.ThirdPartyResource{}
+	err = c.r.Put().Namespace(c.ns).Resource("thirdpartyresources").Name(resource.Name).SubResource("status").Body(resource).Do().Into(result)
+	return
+}
+
+// Delete deletes an existing third party resource.
+func (c *thirdPartyResources) Delete(name string) error {
+	return c.r.Delete().Namespace(c.ns).Resource("thirdpartyresources").Name(name).Do().Error()
+}
+
+// Watch returns a watch.Interface that watches the requested third party resources.
+func (c *thirdPartyResources) Watch(opts api.ListOptions) (watch.Interface, error) {
+	return c.r.Get().
+		Prefix("watch").
+		Namespace(c.ns).
+		Resource("thirdpartyresources").
+		VersionedParams(&opts, api.ParameterCodec).
+		Watch()
+}
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/pkg/master/thirdparty_controller.go b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/pkg/master/thirdparty_controller.go
new file mode 100644
index 0000000000..15b44dfc45
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/pkg/master/thirdparty_controller.go
@@ -0,0 +1,130 @@
+/*
+Copyright 2014 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package master
+
+import (
+	"fmt"
+	"strings"
+
+	"k8s.io/kubernetes/pkg/api"
+	expapi "k8s.io/kubernetes/pkg/apis/extensions"
+	thirdpartyresourceetcd "k8s.io/kubernetes/pkg/registry/thirdpartyresource/etcd"
+	"k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util/sets"
+)
+
+const thirdpartyprefix = "/apis"
+
+func makeThirdPartyPath(group string) string {
+	if len(group) == 0 {
+		return thirdpartyprefix
+	}
+	return thirdpartyprefix + "/" + group
+}
+
+func getThirdPartyGroupName(path string) string {
+	return strings.TrimPrefix(strings.TrimPrefix(path, thirdpartyprefix), "/")
+}
+
+// resourceInterface is the interface for the parts of the master that know how to add/remove
+// third party resources.  Extracted into an interface for injection for testing.
+type resourceInterface interface {
+	// Remove a third party resource based on the RESTful path for that resource
+	RemoveThirdPartyResource(path string) error
+	// Install a third party resource described by 'rsrc'
+	InstallThirdPartyResource(rsrc *expapi.ThirdPartyResource) error
+	// Is a particular third party resource currently installed?
+	HasThirdPartyResource(rsrc *expapi.ThirdPartyResource) (bool, error)
+	// List all currently installed third party resources
+	ListThirdPartyResources() []string
+}
+
+// ThirdPartyController is a control loop that knows how to synchronize ThirdPartyResource objects with
+// RESTful resources which are present in the API server.
+type ThirdPartyController struct {
+	master                     resourceInterface
+	thirdPartyResourceRegistry *thirdpartyresourceetcd.REST
+}
+
+// Synchronize a single resource with RESTful resources on the master
+func (t *ThirdPartyController) SyncOneResource(rsrc *expapi.ThirdPartyResource) error {
+	// TODO: we also need to test if the existing installed resource matches the resource we are sync-ing.
+	// Currently, if there is an older, incompatible resource installed, we won't remove it.  We should detect
+	// older, incompatible resources and remove them before testing if the resource exists.
+	hasResource, err := t.master.HasThirdPartyResource(rsrc)
+	if err != nil {
+		return err
+	}
+	if !hasResource {
+		return t.master.InstallThirdPartyResource(rsrc)
+	}
+	return nil
+}
+
+// Synchronize all resources with RESTful resources on the master
+func (t *ThirdPartyController) SyncResources() error {
+	list, err := t.thirdPartyResourceRegistry.List(api.NewDefaultContext(), nil)
+	if err != nil {
+		return err
+	}
+	return t.syncResourceList(list)
+}
+
+func (t *ThirdPartyController) syncResourceList(list runtime.Object) error {
+	existing := sets.String{}
+	switch list := list.(type) {
+	case *expapi.ThirdPartyResourceList:
+		// Loop across all schema objects for third party resources
+		for ix := range list.Items {
+			item := &list.Items[ix]
+			// extract the api group and resource kind from the schema
+			_, group, err := thirdpartyresourcedata.ExtractApiGroupAndKind(item)
+			if err != nil {
+				return err
+			}
+			// place it in the set of resources that we expect, so that we don't delete it in the delete pass
+			existing.Insert(makeThirdPartyPath(group))
+			// ensure a RESTful resource for this schema exists on the master
+			if err := t.SyncOneResource(item); err != nil {
+				return err
+			}
+		}
+	default:
+		return fmt.Errorf("expected a *ThirdPartyResourceList, got %#v", list)
+	}
+	// deletion phase, get all installed RESTful resources
+	installed := t.master.ListThirdPartyResources()
+	for _, installedAPI := range installed {
+		found := false
+		// search across the expected restful resources to see if this resource belongs to one of the expected ones
+		for _, apiPath := range existing.List() {
+			if installedAPI == apiPath || strings.HasPrefix(installedAPI, apiPath+"/") {
+				found = true
+				break
+			}
+		}
+		// not expected, delete the resource
+		if !found {
+			if err := t.master.RemoveThirdPartyResource(installedAPI); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/LICENSE
new file mode 100644
index 0000000000..7448756763
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/LICENSE
new file mode 100644
index 0000000000..7448756763
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/PATENTS b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/PATENTS
new file mode 100644
index 0000000000..733099041f
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Go project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/htpasswd/COPYING b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/htpasswd/COPYING
new file mode 100644
index 0000000000..c6b097c016
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/htpasswd/COPYING
@@ -0,0 +1,28 @@
+Copyright (C) 2003-2013 Edgewall Software
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+ 3. The name of the author may not be used to endorse or promote
+    products derived from this software without specific prior
+    written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/intemp/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/intemp/LICENSE
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/intemp/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/pause/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/pause/LICENSE
new file mode 100644
index 0000000000..2b5e5ff1ab
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/pause/LICENSE
@@ -0,0 +1,19 @@
+The Expat/MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the 
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+DEALINGS IN THE SOFTWARE.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/swagger-ui/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/swagger-ui/LICENSE
new file mode 100644
index 0000000000..9f93e067e8
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/k8s.io/kubernetes/third_party/swagger-ui/LICENSE
@@ -0,0 +1,11 @@
+Copyright 2014 Reverb Technologies, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/vendor/k8s.io/heapster/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/LICENSE b/vendor/k8s.io/heapster/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/LICENSE
new file mode 100644
index 0000000000..efa1aa1896
--- /dev/null
+++ b/vendor/k8s.io/heapster/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/LICENSE
@@ -0,0 +1,57 @@
+Copyright (c) 2012 Péter Surányi. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+----------------------------------------------------------------------
+Portions of inf.Dec's source code have been derived from Go and are
+covered by the following license:
+----------------------------------------------------------------------
+
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/k8s.io/heapster/LICENSE b/vendor/k8s.io/heapster/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/k8s.io/heapster/LICENSE
rename to vendor/k8s.io/heapster/LICENSE
diff --git a/Godeps/_workspace/src/k8s.io/heapster/metrics/api/v1/types/model_types.go b/vendor/k8s.io/heapster/metrics/api/v1/types/model_types.go
similarity index 100%
rename from Godeps/_workspace/src/k8s.io/heapster/metrics/api/v1/types/model_types.go
rename to vendor/k8s.io/heapster/metrics/api/v1/types/model_types.go
diff --git a/Godeps/_workspace/src/k8s.io/heapster/metrics/api/v1/types/types.go b/vendor/k8s.io/heapster/metrics/api/v1/types/types.go
similarity index 100%
rename from Godeps/_workspace/src/k8s.io/heapster/metrics/api/v1/types/types.go
rename to vendor/k8s.io/heapster/metrics/api/v1/types/types.go
diff --git a/vendor/speter.net/go/exp/math/dec/inf/LICENSE b/vendor/speter.net/go/exp/math/dec/inf/LICENSE
new file mode 100644
index 0000000000..efa1aa1896
--- /dev/null
+++ b/vendor/speter.net/go/exp/math/dec/inf/LICENSE
@@ -0,0 +1,57 @@
+Copyright (c) 2012 Péter Surányi. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+----------------------------------------------------------------------
+Portions of inf.Dec's source code have been derived from Go and are
+covered by the following license:
+----------------------------------------------------------------------
+
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/dec.go b/vendor/speter.net/go/exp/math/dec/inf/dec.go
similarity index 100%
rename from Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/dec.go
rename to vendor/speter.net/go/exp/math/dec/inf/dec.go
diff --git a/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/rounder.go b/vendor/speter.net/go/exp/math/dec/inf/rounder.go
similarity index 100%
rename from Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/rounder.go
rename to vendor/speter.net/go/exp/math/dec/inf/rounder.go