diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index ed0e5ee..7674563 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,7 @@
 {
 	"ImportPath": "github.com/Luzifer/cloudkeys-go",
-	"GoVersion": "go1.4.2",
+	"GoVersion": "go1.6",
+	"GodepVersion": "v62",
 	"Deps": [
 		{
 			"ImportPath": "github.com/Luzifer/rconfig",
diff --git a/Godeps/Readme b/Godeps/Readme
new file mode 100644
index 0000000..4cdaa53
--- /dev/null
+++ b/Godeps/Readme
@@ -0,0 +1,5 @@
+This directory tree is generated automatically by godep.
+
+Please do not edit.
+
+See https://github.com/tools/godep for more information.
diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore
deleted file mode 100644
index f037d68..0000000
--- a/Godeps/_workspace/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/pkg
-/bin
diff --git a/Godeps/_workspace/src/github.com/Luzifer/rconfig/LICENSE b/vendor/github.com/Luzifer/rconfig/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/Luzifer/rconfig/LICENSE
rename to vendor/github.com/Luzifer/rconfig/LICENSE
diff --git a/Godeps/_workspace/src/github.com/Luzifer/rconfig/README.md b/vendor/github.com/Luzifer/rconfig/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/Luzifer/rconfig/README.md
rename to vendor/github.com/Luzifer/rconfig/README.md
diff --git a/Godeps/_workspace/src/github.com/Luzifer/rconfig/config.go b/vendor/github.com/Luzifer/rconfig/config.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Luzifer/rconfig/config.go
rename to vendor/github.com/Luzifer/rconfig/config.go
diff --git a/Godeps/_workspace/src/github.com/Luzifer/rconfig/config_test.go b/vendor/github.com/Luzifer/rconfig/config_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Luzifer/rconfig/config_test.go
rename to vendor/github.com/Luzifer/rconfig/config_test.go
diff --git a/Godeps/_workspace/src/github.com/Luzifer/rconfig/example_test.go b/vendor/github.com/Luzifer/rconfig/example_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Luzifer/rconfig/example_test.go
rename to vendor/github.com/Luzifer/rconfig/example_test.go
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/copy_test.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy_test.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/path_value_test.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value_test.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/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/config_test.go b/vendor/github.com/aws/aws-sdk-go/aws/config_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/config_test.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/chain_provider_test.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider_test.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/credentials_test.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2_role_provider.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2_role_provider.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2_role_provider.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2_role_provider_test.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2_role_provider_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2_role_provider_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2_role_provider_test.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/env_provider_test.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider_test.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/shared_credentials_provider_test.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider_test.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/static_provider_test.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider_test.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/credentials/stscreds/assume_role_provider_test.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/handler_functions.go b/vendor/github.com/aws/aws-sdk-go/aws/handler_functions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/handler_functions.go
rename to vendor/github.com/aws/aws-sdk-go/aws/handler_functions.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/handler_functions_test.go b/vendor/github.com/aws/aws-sdk-go/aws/handler_functions_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/handler_functions_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/handler_functions_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/handlers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/handlers.go
rename to vendor/github.com/aws/aws-sdk-go/aws/handlers.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/handlers_test.go b/vendor/github.com/aws/aws-sdk-go/aws/handlers_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/handlers_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/handlers_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/param_validator.go b/vendor/github.com/aws/aws-sdk-go/aws/param_validator.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/param_validator.go
rename to vendor/github.com/aws/aws-sdk-go/aws/param_validator.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/param_validator_test.go b/vendor/github.com/aws/aws-sdk-go/aws/param_validator_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/param_validator_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/param_validator_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request.go b/vendor/github.com/aws/aws-sdk-go/aws/request.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request.go
rename to vendor/github.com/aws/aws-sdk-go/aws/request.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request_pagination_test.go b/vendor/github.com/aws/aws-sdk-go/aws/request_pagination_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request_pagination_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/request_pagination_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request_test.go b/vendor/github.com/aws/aws-sdk-go/aws/request_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request_test.go
rename to vendor/github.com/aws/aws-sdk-go/aws/request_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service.go b/vendor/github.com/aws/aws-sdk-go/aws/service.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service.go
rename to vendor/github.com/aws/aws-sdk-go/aws/service.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/internal/endpoints/endpoints.go b/vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints/endpoints.go
rename to vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints/endpoints.json b/vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints.json
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints/endpoints.json
rename to vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints.json
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_map.go b/vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_map.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_map.go
rename to vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_map.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_test.go b/vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_test.go
rename to vendor/github.com/aws/aws-sdk-go/internal/endpoints/endpoints_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/query/build.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/query/build.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/query/build.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/query/build.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/query/build_test.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/query/build_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/query/build_test.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/query/build_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/query/queryutil/queryutil.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/query/queryutil/queryutil.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/query/queryutil/queryutil.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/query/queryutil/queryutil.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/query/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/query/unmarshal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/query/unmarshal.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/query/unmarshal.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/query/unmarshal_error.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/query/unmarshal_error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/query/unmarshal_error.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/query/unmarshal_error.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/query/unmarshal_test.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/query/unmarshal_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/query/unmarshal_test.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/query/unmarshal_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/rest/build.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/rest/build.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/rest/build.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/rest/build.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/rest/payload.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/rest/payload.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/rest/payload.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/rest/payload.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/rest/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/rest/unmarshal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/rest/unmarshal.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/rest/unmarshal.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/restxml/build_test.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/restxml/build_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/restxml/build_test.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/restxml/build_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/restxml/restxml.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/restxml/restxml.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/restxml/restxml.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/restxml/restxml.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/restxml/unmarshal_test.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/restxml/unmarshal_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/restxml/unmarshal_test.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/restxml/unmarshal_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/build.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/build.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/build.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/build.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/unmarshal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/unmarshal.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/unmarshal.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/xml_to_struct.go b/vendor/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/xml_to_struct.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/xml_to_struct.go
rename to vendor/github.com/aws/aws-sdk-go/internal/protocol/xml/xmlutil/xml_to_struct.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4/functional_test.go b/vendor/github.com/aws/aws-sdk-go/internal/signer/v4/functional_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4/functional_test.go
rename to vendor/github.com/aws/aws-sdk-go/internal/signer/v4/functional_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4/v4.go b/vendor/github.com/aws/aws-sdk-go/internal/signer/v4/v4.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4/v4.go
rename to vendor/github.com/aws/aws-sdk-go/internal/signer/v4/v4.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4/v4_test.go b/vendor/github.com/aws/aws-sdk-go/internal/signer/v4/v4_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/internal/signer/v4/v4_test.go
rename to vendor/github.com/aws/aws-sdk-go/internal/signer/v4/v4_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/api.go b/vendor/github.com/aws/aws-sdk-go/service/s3/api.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/api.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/api.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/bucket_location.go b/vendor/github.com/aws/aws-sdk-go/service/s3/bucket_location.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/bucket_location.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/bucket_location.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/bucket_location_test.go b/vendor/github.com/aws/aws-sdk-go/service/s3/bucket_location_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/bucket_location_test.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/bucket_location_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/content_md5.go b/vendor/github.com/aws/aws-sdk-go/service/s3/content_md5.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/content_md5.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/content_md5.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/customizations.go b/vendor/github.com/aws/aws-sdk-go/service/s3/customizations.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/customizations.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/customizations.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/customizations_test.go b/vendor/github.com/aws/aws-sdk-go/service/s3/customizations_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/customizations_test.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/customizations_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/examples_test.go b/vendor/github.com/aws/aws-sdk-go/service/s3/examples_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/examples_test.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/examples_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/host_style_bucket.go b/vendor/github.com/aws/aws-sdk-go/service/s3/host_style_bucket.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/host_style_bucket.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/host_style_bucket.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/host_style_bucket_test.go b/vendor/github.com/aws/aws-sdk-go/service/s3/host_style_bucket_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/host_style_bucket_test.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/host_style_bucket_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3iface/interface.go b/vendor/github.com/aws/aws-sdk-go/service/s3/s3iface/interface.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3iface/interface.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/s3iface/interface.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3iface/interface_test.go b/vendor/github.com/aws/aws-sdk-go/service/s3/s3iface/interface_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3iface/interface_test.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/s3iface/interface_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/download.go b/vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/download.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/download.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/download.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/download_test.go b/vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/download_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/download_test.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/download_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/upload.go b/vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/upload.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/upload.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/upload.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/upload_test.go b/vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/upload_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/s3manager/upload_test.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/upload_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/service.go b/vendor/github.com/aws/aws-sdk-go/service/s3/service.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/service.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/service.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/sse.go b/vendor/github.com/aws/aws-sdk-go/service/s3/sse.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/sse.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/sse.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/sse_test.go b/vendor/github.com/aws/aws-sdk-go/service/s3/sse_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/sse_test.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/sse_test.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/unmarshal_error.go b/vendor/github.com/aws/aws-sdk-go/service/s3/unmarshal_error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/unmarshal_error.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/unmarshal_error.go
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/unmarshal_error_test.go b/vendor/github.com/aws/aws-sdk-go/service/s3/unmarshal_error_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/s3/unmarshal_error_test.go
rename to vendor/github.com/aws/aws-sdk-go/service/s3/unmarshal_error_test.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/.gitignore b/vendor/github.com/flosch/pongo2/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/.gitignore
rename to vendor/github.com/flosch/pongo2/.gitignore
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/.travis.yml b/vendor/github.com/flosch/pongo2/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/.travis.yml
rename to vendor/github.com/flosch/pongo2/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/AUTHORS b/vendor/github.com/flosch/pongo2/AUTHORS
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/AUTHORS
rename to vendor/github.com/flosch/pongo2/AUTHORS
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/LICENSE b/vendor/github.com/flosch/pongo2/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/LICENSE
rename to vendor/github.com/flosch/pongo2/LICENSE
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/README.md b/vendor/github.com/flosch/pongo2/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/README.md
rename to vendor/github.com/flosch/pongo2/README.md
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/context.go b/vendor/github.com/flosch/pongo2/context.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/context.go
rename to vendor/github.com/flosch/pongo2/context.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/doc.go b/vendor/github.com/flosch/pongo2/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/doc.go
rename to vendor/github.com/flosch/pongo2/doc.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/docs/examples.md b/vendor/github.com/flosch/pongo2/docs/examples.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/docs/examples.md
rename to vendor/github.com/flosch/pongo2/docs/examples.md
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/docs/filters.md b/vendor/github.com/flosch/pongo2/docs/filters.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/docs/filters.md
rename to vendor/github.com/flosch/pongo2/docs/filters.md
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/docs/index.md b/vendor/github.com/flosch/pongo2/docs/index.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/docs/index.md
rename to vendor/github.com/flosch/pongo2/docs/index.md
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/docs/macros.md b/vendor/github.com/flosch/pongo2/docs/macros.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/docs/macros.md
rename to vendor/github.com/flosch/pongo2/docs/macros.md
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/docs/tags.md b/vendor/github.com/flosch/pongo2/docs/tags.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/docs/tags.md
rename to vendor/github.com/flosch/pongo2/docs/tags.md
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/docs/template_sets.md b/vendor/github.com/flosch/pongo2/docs/template_sets.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/docs/template_sets.md
rename to vendor/github.com/flosch/pongo2/docs/template_sets.md
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/docs/write_filters.md b/vendor/github.com/flosch/pongo2/docs/write_filters.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/docs/write_filters.md
rename to vendor/github.com/flosch/pongo2/docs/write_filters.md
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/docs/write_tags.md b/vendor/github.com/flosch/pongo2/docs/write_tags.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/docs/write_tags.md
rename to vendor/github.com/flosch/pongo2/docs/write_tags.md
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/error.go b/vendor/github.com/flosch/pongo2/error.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/error.go
rename to vendor/github.com/flosch/pongo2/error.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/filters.go b/vendor/github.com/flosch/pongo2/filters.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/filters.go
rename to vendor/github.com/flosch/pongo2/filters.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/filters_builtin.go b/vendor/github.com/flosch/pongo2/filters_builtin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/filters_builtin.go
rename to vendor/github.com/flosch/pongo2/filters_builtin.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/helpers.go b/vendor/github.com/flosch/pongo2/helpers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/helpers.go
rename to vendor/github.com/flosch/pongo2/helpers.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/lexer.go b/vendor/github.com/flosch/pongo2/lexer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/lexer.go
rename to vendor/github.com/flosch/pongo2/lexer.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/nodes.go b/vendor/github.com/flosch/pongo2/nodes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/nodes.go
rename to vendor/github.com/flosch/pongo2/nodes.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/nodes_html.go b/vendor/github.com/flosch/pongo2/nodes_html.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/nodes_html.go
rename to vendor/github.com/flosch/pongo2/nodes_html.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/nodes_wrapper.go b/vendor/github.com/flosch/pongo2/nodes_wrapper.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/nodes_wrapper.go
rename to vendor/github.com/flosch/pongo2/nodes_wrapper.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/parser.go b/vendor/github.com/flosch/pongo2/parser.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/parser.go
rename to vendor/github.com/flosch/pongo2/parser.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/parser_document.go b/vendor/github.com/flosch/pongo2/parser_document.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/parser_document.go
rename to vendor/github.com/flosch/pongo2/parser_document.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/parser_expression.go b/vendor/github.com/flosch/pongo2/parser_expression.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/parser_expression.go
rename to vendor/github.com/flosch/pongo2/parser_expression.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/pongo2.go b/vendor/github.com/flosch/pongo2/pongo2.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/pongo2.go
rename to vendor/github.com/flosch/pongo2/pongo2.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/pongo2_issues_test.go b/vendor/github.com/flosch/pongo2/pongo2_issues_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/pongo2_issues_test.go
rename to vendor/github.com/flosch/pongo2/pongo2_issues_test.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/pongo2_template_test.go b/vendor/github.com/flosch/pongo2/pongo2_template_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/pongo2_template_test.go
rename to vendor/github.com/flosch/pongo2/pongo2_template_test.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/pongo2_test.go b/vendor/github.com/flosch/pongo2/pongo2_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/pongo2_test.go
rename to vendor/github.com/flosch/pongo2/pongo2_test.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags.go b/vendor/github.com/flosch/pongo2/tags.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags.go
rename to vendor/github.com/flosch/pongo2/tags.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_autoescape.go b/vendor/github.com/flosch/pongo2/tags_autoescape.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_autoescape.go
rename to vendor/github.com/flosch/pongo2/tags_autoescape.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_block.go b/vendor/github.com/flosch/pongo2/tags_block.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_block.go
rename to vendor/github.com/flosch/pongo2/tags_block.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_comment.go b/vendor/github.com/flosch/pongo2/tags_comment.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_comment.go
rename to vendor/github.com/flosch/pongo2/tags_comment.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_cycle.go b/vendor/github.com/flosch/pongo2/tags_cycle.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_cycle.go
rename to vendor/github.com/flosch/pongo2/tags_cycle.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_extends.go b/vendor/github.com/flosch/pongo2/tags_extends.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_extends.go
rename to vendor/github.com/flosch/pongo2/tags_extends.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_filter.go b/vendor/github.com/flosch/pongo2/tags_filter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_filter.go
rename to vendor/github.com/flosch/pongo2/tags_filter.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_firstof.go b/vendor/github.com/flosch/pongo2/tags_firstof.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_firstof.go
rename to vendor/github.com/flosch/pongo2/tags_firstof.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_for.go b/vendor/github.com/flosch/pongo2/tags_for.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_for.go
rename to vendor/github.com/flosch/pongo2/tags_for.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_if.go b/vendor/github.com/flosch/pongo2/tags_if.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_if.go
rename to vendor/github.com/flosch/pongo2/tags_if.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_ifchanged.go b/vendor/github.com/flosch/pongo2/tags_ifchanged.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_ifchanged.go
rename to vendor/github.com/flosch/pongo2/tags_ifchanged.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_ifequal.go b/vendor/github.com/flosch/pongo2/tags_ifequal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_ifequal.go
rename to vendor/github.com/flosch/pongo2/tags_ifequal.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_ifnotequal.go b/vendor/github.com/flosch/pongo2/tags_ifnotequal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_ifnotequal.go
rename to vendor/github.com/flosch/pongo2/tags_ifnotequal.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_import.go b/vendor/github.com/flosch/pongo2/tags_import.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_import.go
rename to vendor/github.com/flosch/pongo2/tags_import.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_include.go b/vendor/github.com/flosch/pongo2/tags_include.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_include.go
rename to vendor/github.com/flosch/pongo2/tags_include.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_lorem.go b/vendor/github.com/flosch/pongo2/tags_lorem.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_lorem.go
rename to vendor/github.com/flosch/pongo2/tags_lorem.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_macro.go b/vendor/github.com/flosch/pongo2/tags_macro.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_macro.go
rename to vendor/github.com/flosch/pongo2/tags_macro.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_now.go b/vendor/github.com/flosch/pongo2/tags_now.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_now.go
rename to vendor/github.com/flosch/pongo2/tags_now.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_set.go b/vendor/github.com/flosch/pongo2/tags_set.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_set.go
rename to vendor/github.com/flosch/pongo2/tags_set.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_spaceless.go b/vendor/github.com/flosch/pongo2/tags_spaceless.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_spaceless.go
rename to vendor/github.com/flosch/pongo2/tags_spaceless.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_ssi.go b/vendor/github.com/flosch/pongo2/tags_ssi.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_ssi.go
rename to vendor/github.com/flosch/pongo2/tags_ssi.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_templatetag.go b/vendor/github.com/flosch/pongo2/tags_templatetag.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_templatetag.go
rename to vendor/github.com/flosch/pongo2/tags_templatetag.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_widthratio.go b/vendor/github.com/flosch/pongo2/tags_widthratio.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_widthratio.go
rename to vendor/github.com/flosch/pongo2/tags_widthratio.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/tags_with.go b/vendor/github.com/flosch/pongo2/tags_with.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/tags_with.go
rename to vendor/github.com/flosch/pongo2/tags_with.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template.go b/vendor/github.com/flosch/pongo2/template.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template.go
rename to vendor/github.com/flosch/pongo2/template.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_sets.go b/vendor/github.com/flosch/pongo2/template_sets.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_sets.go
rename to vendor/github.com/flosch/pongo2/template_sets.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/autoescape.tpl b/vendor/github.com/flosch/pongo2/template_tests/autoescape.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/autoescape.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/autoescape.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/autoescape.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/autoescape.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/autoescape.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/autoescape.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/base_dir_test/base.html b/vendor/github.com/flosch/pongo2/template_tests/base_dir_test/base.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/base_dir_test/base.html
rename to vendor/github.com/flosch/pongo2/template_tests/base_dir_test/base.html
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/base_dir_test/subdir/include.html b/vendor/github.com/flosch/pongo2/template_tests/base_dir_test/subdir/include.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/base_dir_test/subdir/include.html
rename to vendor/github.com/flosch/pongo2/template_tests/base_dir_test/subdir/include.html
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/base_dir_test/subdir/index.html b/vendor/github.com/flosch/pongo2/template_tests/base_dir_test/subdir/index.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/base_dir_test/subdir/index.html
rename to vendor/github.com/flosch/pongo2/template_tests/base_dir_test/subdir/index.html
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/base_dir_test/subdir/ssi.html b/vendor/github.com/flosch/pongo2/template_tests/base_dir_test/subdir/ssi.html
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/base_dir_test/subdir/ssi.html
rename to vendor/github.com/flosch/pongo2/template_tests/base_dir_test/subdir/ssi.html
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/complex.tpl b/vendor/github.com/flosch/pongo2/template_tests/complex.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/complex.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/complex.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/complex.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/complex.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/complex.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/complex.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/cycle.tpl b/vendor/github.com/flosch/pongo2/template_tests/cycle.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/cycle.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/cycle.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/cycle.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/cycle.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/cycle.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/cycle.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/empty.tpl b/vendor/github.com/flosch/pongo2/template_tests/empty.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/empty.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/empty.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/empty.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/empty.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/empty.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/empty.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/expressions.tpl b/vendor/github.com/flosch/pongo2/template_tests/expressions.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/expressions.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/expressions.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/expressions.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/expressions.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/expressions.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/expressions.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/extends.tpl b/vendor/github.com/flosch/pongo2/template_tests/extends.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/extends.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/extends.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/extends.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/extends.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/extends.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/extends.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/filters-compilation.err b/vendor/github.com/flosch/pongo2/template_tests/filters-compilation.err
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/filters-compilation.err
rename to vendor/github.com/flosch/pongo2/template_tests/filters-compilation.err
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/filters-compilation.err.out b/vendor/github.com/flosch/pongo2/template_tests/filters-compilation.err.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/filters-compilation.err.out
rename to vendor/github.com/flosch/pongo2/template_tests/filters-compilation.err.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/filters-execution.err b/vendor/github.com/flosch/pongo2/template_tests/filters-execution.err
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/filters-execution.err
rename to vendor/github.com/flosch/pongo2/template_tests/filters-execution.err
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/filters-execution.err.out b/vendor/github.com/flosch/pongo2/template_tests/filters-execution.err.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/filters-execution.err.out
rename to vendor/github.com/flosch/pongo2/template_tests/filters-execution.err.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/filters.tpl b/vendor/github.com/flosch/pongo2/template_tests/filters.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/filters.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/filters.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/filters.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/filters.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/filters.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/filters.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/firstof.tpl b/vendor/github.com/flosch/pongo2/template_tests/firstof.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/firstof.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/firstof.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/firstof.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/firstof.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/firstof.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/firstof.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/for.tpl b/vendor/github.com/flosch/pongo2/template_tests/for.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/for.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/for.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/for.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/for.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/for.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/for.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/function_calls_wrapper.tpl b/vendor/github.com/flosch/pongo2/template_tests/function_calls_wrapper.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/function_calls_wrapper.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/function_calls_wrapper.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/function_calls_wrapper.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/function_calls_wrapper.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/function_calls_wrapper.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/function_calls_wrapper.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/if.tpl b/vendor/github.com/flosch/pongo2/template_tests/if.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/if.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/if.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/if.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/if.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/if.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/if.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/ifchanged.tpl b/vendor/github.com/flosch/pongo2/template_tests/ifchanged.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/ifchanged.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/ifchanged.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/ifchanged.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/ifchanged.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/ifchanged.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/ifchanged.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/includes.helper b/vendor/github.com/flosch/pongo2/template_tests/includes.helper
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/includes.helper
rename to vendor/github.com/flosch/pongo2/template_tests/includes.helper
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/includes.tpl b/vendor/github.com/flosch/pongo2/template_tests/includes.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/includes.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/includes.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/includes.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/includes.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/includes.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/includes.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/inheritance/base.tpl b/vendor/github.com/flosch/pongo2/template_tests/inheritance/base.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/inheritance/base.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/inheritance/base.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/inheritance/base2.tpl b/vendor/github.com/flosch/pongo2/template_tests/inheritance/base2.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/inheritance/base2.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/inheritance/base2.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/inheritance/cycle_include.tpl b/vendor/github.com/flosch/pongo2/template_tests/inheritance/cycle_include.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/inheritance/cycle_include.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/inheritance/cycle_include.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/inheritance/inheritance2/skeleton.tpl b/vendor/github.com/flosch/pongo2/template_tests/inheritance/inheritance2/skeleton.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/inheritance/inheritance2/skeleton.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/inheritance/inheritance2/skeleton.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/issues.tpl b/vendor/github.com/flosch/pongo2/template_tests/issues.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/issues.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/issues.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/issues.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/issues.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/issues.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/issues.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/lorem.tpl b/vendor/github.com/flosch/pongo2/template_tests/lorem.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/lorem.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/lorem.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/lorem.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/lorem.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/lorem.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/lorem.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro-compilation.err b/vendor/github.com/flosch/pongo2/template_tests/macro-compilation.err
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro-compilation.err
rename to vendor/github.com/flosch/pongo2/template_tests/macro-compilation.err
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro-compilation.err.out b/vendor/github.com/flosch/pongo2/template_tests/macro-compilation.err.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro-compilation.err.out
rename to vendor/github.com/flosch/pongo2/template_tests/macro-compilation.err.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro-execution.err b/vendor/github.com/flosch/pongo2/template_tests/macro-execution.err
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro-execution.err
rename to vendor/github.com/flosch/pongo2/template_tests/macro-execution.err
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro-execution.err.out b/vendor/github.com/flosch/pongo2/template_tests/macro-execution.err.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro-execution.err.out
rename to vendor/github.com/flosch/pongo2/template_tests/macro-execution.err.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro.helper b/vendor/github.com/flosch/pongo2/template_tests/macro.helper
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro.helper
rename to vendor/github.com/flosch/pongo2/template_tests/macro.helper
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro.tpl b/vendor/github.com/flosch/pongo2/template_tests/macro.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/macro.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/macro.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/macro.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro2.helper b/vendor/github.com/flosch/pongo2/template_tests/macro2.helper
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/macro2.helper
rename to vendor/github.com/flosch/pongo2/template_tests/macro2.helper
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/now.tpl b/vendor/github.com/flosch/pongo2/template_tests/now.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/now.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/now.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/now.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/now.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/now.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/now.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/pongo2ctx.tpl b/vendor/github.com/flosch/pongo2/template_tests/pongo2ctx.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/pongo2ctx.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/pongo2ctx.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/pongo2ctx.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/pongo2ctx.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/pongo2ctx.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/pongo2ctx.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/sandbox-compilation.err b/vendor/github.com/flosch/pongo2/template_tests/sandbox-compilation.err
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/sandbox-compilation.err
rename to vendor/github.com/flosch/pongo2/template_tests/sandbox-compilation.err
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/sandbox-compilation.err.out b/vendor/github.com/flosch/pongo2/template_tests/sandbox-compilation.err.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/sandbox-compilation.err.out
rename to vendor/github.com/flosch/pongo2/template_tests/sandbox-compilation.err.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/sandbox.tpl b/vendor/github.com/flosch/pongo2/template_tests/sandbox.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/sandbox.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/sandbox.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/sandbox.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/sandbox.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/sandbox.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/sandbox.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/set.tpl b/vendor/github.com/flosch/pongo2/template_tests/set.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/set.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/set.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/set.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/set.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/set.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/set.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/spaceless.tpl b/vendor/github.com/flosch/pongo2/template_tests/spaceless.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/spaceless.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/spaceless.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/spaceless.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/spaceless.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/spaceless.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/spaceless.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/ssi.helper b/vendor/github.com/flosch/pongo2/template_tests/ssi.helper
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/ssi.helper
rename to vendor/github.com/flosch/pongo2/template_tests/ssi.helper
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/ssi.tpl b/vendor/github.com/flosch/pongo2/template_tests/ssi.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/ssi.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/ssi.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/ssi.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/ssi.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/ssi.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/ssi.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/tag_filter.tpl b/vendor/github.com/flosch/pongo2/template_tests/tag_filter.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/tag_filter.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/tag_filter.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/tag_filter.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/tag_filter.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/tag_filter.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/tag_filter.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/tags-compilation.err b/vendor/github.com/flosch/pongo2/template_tests/tags-compilation.err
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/tags-compilation.err
rename to vendor/github.com/flosch/pongo2/template_tests/tags-compilation.err
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/tags-compilation.err.out b/vendor/github.com/flosch/pongo2/template_tests/tags-compilation.err.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/tags-compilation.err.out
rename to vendor/github.com/flosch/pongo2/template_tests/tags-compilation.err.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/template_sets.tpl b/vendor/github.com/flosch/pongo2/template_tests/template_sets.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/template_sets.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/template_sets.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/template_sets.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/template_sets.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/template_sets.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/template_sets.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/templatetag.tpl b/vendor/github.com/flosch/pongo2/template_tests/templatetag.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/templatetag.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/templatetag.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/templatetag.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/templatetag.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/templatetag.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/templatetag.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/variables.tpl b/vendor/github.com/flosch/pongo2/template_tests/variables.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/variables.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/variables.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/variables.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/variables.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/variables.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/variables.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/verbatim.tpl b/vendor/github.com/flosch/pongo2/template_tests/verbatim.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/verbatim.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/verbatim.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/verbatim.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/verbatim.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/verbatim.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/verbatim.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/widthratio.tpl b/vendor/github.com/flosch/pongo2/template_tests/widthratio.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/widthratio.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/widthratio.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/widthratio.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/widthratio.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/widthratio.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/widthratio.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/with.helper b/vendor/github.com/flosch/pongo2/template_tests/with.helper
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/with.helper
rename to vendor/github.com/flosch/pongo2/template_tests/with.helper
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/with.tpl b/vendor/github.com/flosch/pongo2/template_tests/with.tpl
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/with.tpl
rename to vendor/github.com/flosch/pongo2/template_tests/with.tpl
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/with.tpl.out b/vendor/github.com/flosch/pongo2/template_tests/with.tpl.out
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/template_tests/with.tpl.out
rename to vendor/github.com/flosch/pongo2/template_tests/with.tpl.out
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/value.go b/vendor/github.com/flosch/pongo2/value.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/value.go
rename to vendor/github.com/flosch/pongo2/value.go
diff --git a/Godeps/_workspace/src/github.com/flosch/pongo2/variable.go b/vendor/github.com/flosch/pongo2/variable.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/flosch/pongo2/variable.go
rename to vendor/github.com/flosch/pongo2/variable.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/gorilla/context/LICENSE b/vendor/github.com/gorilla/context/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/context/LICENSE
rename to vendor/github.com/gorilla/context/LICENSE
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/README.md b/vendor/github.com/gorilla/context/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/context/README.md
rename to vendor/github.com/gorilla/context/README.md
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/context.go b/vendor/github.com/gorilla/context/context.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/context/context.go
rename to vendor/github.com/gorilla/context/context.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/context_test.go b/vendor/github.com/gorilla/context/context_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/context/context_test.go
rename to vendor/github.com/gorilla/context/context_test.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/doc.go b/vendor/github.com/gorilla/context/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/context/doc.go
rename to vendor/github.com/gorilla/context/doc.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/.travis.yml b/vendor/github.com/gorilla/mux/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/.travis.yml
rename to vendor/github.com/gorilla/mux/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/LICENSE b/vendor/github.com/gorilla/mux/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/LICENSE
rename to vendor/github.com/gorilla/mux/LICENSE
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/README.md b/vendor/github.com/gorilla/mux/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/README.md
rename to vendor/github.com/gorilla/mux/README.md
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/bench_test.go b/vendor/github.com/gorilla/mux/bench_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/bench_test.go
rename to vendor/github.com/gorilla/mux/bench_test.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/doc.go b/vendor/github.com/gorilla/mux/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/doc.go
rename to vendor/github.com/gorilla/mux/doc.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/mux.go b/vendor/github.com/gorilla/mux/mux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/mux.go
rename to vendor/github.com/gorilla/mux/mux.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go b/vendor/github.com/gorilla/mux/mux_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go
rename to vendor/github.com/gorilla/mux/mux_test.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/old_test.go b/vendor/github.com/gorilla/mux/old_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/old_test.go
rename to vendor/github.com/gorilla/mux/old_test.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/regexp.go b/vendor/github.com/gorilla/mux/regexp.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/regexp.go
rename to vendor/github.com/gorilla/mux/regexp.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/route.go b/vendor/github.com/gorilla/mux/route.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/mux/route.go
rename to vendor/github.com/gorilla/mux/route.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/securecookie/.travis.yml b/vendor/github.com/gorilla/securecookie/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/securecookie/.travis.yml
rename to vendor/github.com/gorilla/securecookie/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/gorilla/securecookie/LICENSE b/vendor/github.com/gorilla/securecookie/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/securecookie/LICENSE
rename to vendor/github.com/gorilla/securecookie/LICENSE
diff --git a/Godeps/_workspace/src/github.com/gorilla/securecookie/README.md b/vendor/github.com/gorilla/securecookie/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/securecookie/README.md
rename to vendor/github.com/gorilla/securecookie/README.md
diff --git a/Godeps/_workspace/src/github.com/gorilla/securecookie/doc.go b/vendor/github.com/gorilla/securecookie/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/securecookie/doc.go
rename to vendor/github.com/gorilla/securecookie/doc.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/securecookie/securecookie.go b/vendor/github.com/gorilla/securecookie/securecookie.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/securecookie/securecookie.go
rename to vendor/github.com/gorilla/securecookie/securecookie.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/securecookie/securecookie_test.go b/vendor/github.com/gorilla/securecookie/securecookie_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/securecookie/securecookie_test.go
rename to vendor/github.com/gorilla/securecookie/securecookie_test.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/sessions/.travis.yml b/vendor/github.com/gorilla/sessions/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/sessions/.travis.yml
rename to vendor/github.com/gorilla/sessions/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/gorilla/sessions/LICENSE b/vendor/github.com/gorilla/sessions/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/sessions/LICENSE
rename to vendor/github.com/gorilla/sessions/LICENSE
diff --git a/Godeps/_workspace/src/github.com/gorilla/sessions/README.md b/vendor/github.com/gorilla/sessions/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/sessions/README.md
rename to vendor/github.com/gorilla/sessions/README.md
diff --git a/Godeps/_workspace/src/github.com/gorilla/sessions/doc.go b/vendor/github.com/gorilla/sessions/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/sessions/doc.go
rename to vendor/github.com/gorilla/sessions/doc.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/sessions/sessions.go b/vendor/github.com/gorilla/sessions/sessions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/sessions/sessions.go
rename to vendor/github.com/gorilla/sessions/sessions.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/sessions/sessions_test.go b/vendor/github.com/gorilla/sessions/sessions_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/sessions/sessions_test.go
rename to vendor/github.com/gorilla/sessions/sessions_test.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/sessions/store.go b/vendor/github.com/gorilla/sessions/store.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/sessions/store.go
rename to vendor/github.com/gorilla/sessions/store.go
diff --git a/Godeps/_workspace/src/github.com/gorilla/sessions/store_test.go b/vendor/github.com/gorilla/sessions/store_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gorilla/sessions/store_test.go
rename to vendor/github.com/gorilla/sessions/store_test.go
diff --git a/Godeps/_workspace/src/github.com/satori/go.uuid/.travis.yml b/vendor/github.com/satori/go.uuid/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/satori/go.uuid/.travis.yml
rename to vendor/github.com/satori/go.uuid/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/satori/go.uuid/LICENSE b/vendor/github.com/satori/go.uuid/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/satori/go.uuid/LICENSE
rename to vendor/github.com/satori/go.uuid/LICENSE
diff --git a/Godeps/_workspace/src/github.com/satori/go.uuid/README.md b/vendor/github.com/satori/go.uuid/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/satori/go.uuid/README.md
rename to vendor/github.com/satori/go.uuid/README.md
diff --git a/Godeps/_workspace/src/github.com/satori/go.uuid/benchmarks_test.go b/vendor/github.com/satori/go.uuid/benchmarks_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/satori/go.uuid/benchmarks_test.go
rename to vendor/github.com/satori/go.uuid/benchmarks_test.go
diff --git a/Godeps/_workspace/src/github.com/satori/go.uuid/uuid.go b/vendor/github.com/satori/go.uuid/uuid.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/satori/go.uuid/uuid.go
rename to vendor/github.com/satori/go.uuid/uuid.go
diff --git a/Godeps/_workspace/src/github.com/satori/go.uuid/uuid_test.go b/vendor/github.com/satori/go.uuid/uuid_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/satori/go.uuid/uuid_test.go
rename to vendor/github.com/satori/go.uuid/uuid_test.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/.travis.yml b/vendor/github.com/spf13/pflag/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/.travis.yml
rename to vendor/github.com/spf13/pflag/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE b/vendor/github.com/spf13/pflag/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/LICENSE
rename to vendor/github.com/spf13/pflag/LICENSE
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/README.md b/vendor/github.com/spf13/pflag/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/README.md
rename to vendor/github.com/spf13/pflag/README.md
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/bool.go b/vendor/github.com/spf13/pflag/bool.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/bool.go
rename to vendor/github.com/spf13/pflag/bool.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/bool_test.go b/vendor/github.com/spf13/pflag/bool_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/bool_test.go
rename to vendor/github.com/spf13/pflag/bool_test.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/duration.go b/vendor/github.com/spf13/pflag/duration.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/duration.go
rename to vendor/github.com/spf13/pflag/duration.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/example_test.go b/vendor/github.com/spf13/pflag/example_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/example_test.go
rename to vendor/github.com/spf13/pflag/example_test.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/export_test.go b/vendor/github.com/spf13/pflag/export_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/export_test.go
rename to vendor/github.com/spf13/pflag/export_test.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/flag.go b/vendor/github.com/spf13/pflag/flag.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/flag.go
rename to vendor/github.com/spf13/pflag/flag.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/flag_test.go b/vendor/github.com/spf13/pflag/flag_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/flag_test.go
rename to vendor/github.com/spf13/pflag/flag_test.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/float32.go b/vendor/github.com/spf13/pflag/float32.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/float32.go
rename to vendor/github.com/spf13/pflag/float32.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/float64.go b/vendor/github.com/spf13/pflag/float64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/float64.go
rename to vendor/github.com/spf13/pflag/float64.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int.go b/vendor/github.com/spf13/pflag/int.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/int.go
rename to vendor/github.com/spf13/pflag/int.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int32.go b/vendor/github.com/spf13/pflag/int32.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/int32.go
rename to vendor/github.com/spf13/pflag/int32.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int64.go b/vendor/github.com/spf13/pflag/int64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/int64.go
rename to vendor/github.com/spf13/pflag/int64.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int8.go b/vendor/github.com/spf13/pflag/int8.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/int8.go
rename to vendor/github.com/spf13/pflag/int8.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/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/int_slice_test.go b/vendor/github.com/spf13/pflag/int_slice_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/int_slice_test.go
rename to vendor/github.com/spf13/pflag/int_slice_test.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/ip.go b/vendor/github.com/spf13/pflag/ip.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/ip.go
rename to vendor/github.com/spf13/pflag/ip.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go b/vendor/github.com/spf13/pflag/ipmask.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go
rename to vendor/github.com/spf13/pflag/ipmask.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/string.go b/vendor/github.com/spf13/pflag/string.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/string.go
rename to vendor/github.com/spf13/pflag/string.go
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/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/string_slice_test.go b/vendor/github.com/spf13/pflag/string_slice_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/spf13/pflag/string_slice_test.go
rename to vendor/github.com/spf13/pflag/string_slice_test.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/vaughan0/go-ini/LICENSE b/vendor/github.com/vaughan0/go-ini/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/LICENSE
rename to vendor/github.com/vaughan0/go-ini/LICENSE
diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/README.md b/vendor/github.com/vaughan0/go-ini/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/README.md
rename to vendor/github.com/vaughan0/go-ini/README.md
diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini.go b/vendor/github.com/vaughan0/go-ini/ini.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/ini.go
rename to vendor/github.com/vaughan0/go-ini/ini.go
diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_linux_test.go b/vendor/github.com/vaughan0/go-ini/ini_linux_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_linux_test.go
rename to vendor/github.com/vaughan0/go-ini/ini_linux_test.go
diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_test.go b/vendor/github.com/vaughan0/go-ini/ini_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/ini_test.go
rename to vendor/github.com/vaughan0/go-ini/ini_test.go
diff --git a/Godeps/_workspace/src/github.com/vaughan0/go-ini/test.ini b/vendor/github.com/vaughan0/go-ini/test.ini
similarity index 100%
rename from Godeps/_workspace/src/github.com/vaughan0/go-ini/test.ini
rename to vendor/github.com/vaughan0/go-ini/test.ini
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/.gitignore b/vendor/github.com/xuyu/goredis/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/.gitignore
rename to vendor/github.com/xuyu/goredis/.gitignore
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/LICENSE b/vendor/github.com/xuyu/goredis/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/LICENSE
rename to vendor/github.com/xuyu/goredis/LICENSE
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/README.md b/vendor/github.com/xuyu/goredis/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/README.md
rename to vendor/github.com/xuyu/goredis/README.md
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/connection.go b/vendor/github.com/xuyu/goredis/connection.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/connection.go
rename to vendor/github.com/xuyu/goredis/connection.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/connection_test.go b/vendor/github.com/xuyu/goredis/connection_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/connection_test.go
rename to vendor/github.com/xuyu/goredis/connection_test.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/hashes.go b/vendor/github.com/xuyu/goredis/hashes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/hashes.go
rename to vendor/github.com/xuyu/goredis/hashes.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/hashes_test.go b/vendor/github.com/xuyu/goredis/hashes_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/hashes_test.go
rename to vendor/github.com/xuyu/goredis/hashes_test.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/hyperloglog.go b/vendor/github.com/xuyu/goredis/hyperloglog.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/hyperloglog.go
rename to vendor/github.com/xuyu/goredis/hyperloglog.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/hyperloglog_test.go b/vendor/github.com/xuyu/goredis/hyperloglog_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/hyperloglog_test.go
rename to vendor/github.com/xuyu/goredis/hyperloglog_test.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/keys.go b/vendor/github.com/xuyu/goredis/keys.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/keys.go
rename to vendor/github.com/xuyu/goredis/keys.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/keys_test.go b/vendor/github.com/xuyu/goredis/keys_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/keys_test.go
rename to vendor/github.com/xuyu/goredis/keys_test.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/lists.go b/vendor/github.com/xuyu/goredis/lists.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/lists.go
rename to vendor/github.com/xuyu/goredis/lists.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/lists_test.go b/vendor/github.com/xuyu/goredis/lists_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/lists_test.go
rename to vendor/github.com/xuyu/goredis/lists_test.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/pipelining.go b/vendor/github.com/xuyu/goredis/pipelining.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/pipelining.go
rename to vendor/github.com/xuyu/goredis/pipelining.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/pipelining_test.go b/vendor/github.com/xuyu/goredis/pipelining_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/pipelining_test.go
rename to vendor/github.com/xuyu/goredis/pipelining_test.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/pubsub.go b/vendor/github.com/xuyu/goredis/pubsub.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/pubsub.go
rename to vendor/github.com/xuyu/goredis/pubsub.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/pubsub_test.go b/vendor/github.com/xuyu/goredis/pubsub_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/pubsub_test.go
rename to vendor/github.com/xuyu/goredis/pubsub_test.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/redis.go b/vendor/github.com/xuyu/goredis/redis.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/redis.go
rename to vendor/github.com/xuyu/goredis/redis.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/redis_test.go b/vendor/github.com/xuyu/goredis/redis_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/redis_test.go
rename to vendor/github.com/xuyu/goredis/redis_test.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/scripting.go b/vendor/github.com/xuyu/goredis/scripting.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/scripting.go
rename to vendor/github.com/xuyu/goredis/scripting.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/scripting_test.go b/vendor/github.com/xuyu/goredis/scripting_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/scripting_test.go
rename to vendor/github.com/xuyu/goredis/scripting_test.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/server.go b/vendor/github.com/xuyu/goredis/server.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/server.go
rename to vendor/github.com/xuyu/goredis/server.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/server_test.go b/vendor/github.com/xuyu/goredis/server_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/server_test.go
rename to vendor/github.com/xuyu/goredis/server_test.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/sets.go b/vendor/github.com/xuyu/goredis/sets.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/sets.go
rename to vendor/github.com/xuyu/goredis/sets.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/sets_test.go b/vendor/github.com/xuyu/goredis/sets_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/sets_test.go
rename to vendor/github.com/xuyu/goredis/sets_test.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/sort.go b/vendor/github.com/xuyu/goredis/sort.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/sort.go
rename to vendor/github.com/xuyu/goredis/sort.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/sort_test.go b/vendor/github.com/xuyu/goredis/sort_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/sort_test.go
rename to vendor/github.com/xuyu/goredis/sort_test.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/sorted_sets.go b/vendor/github.com/xuyu/goredis/sorted_sets.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/sorted_sets.go
rename to vendor/github.com/xuyu/goredis/sorted_sets.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/sorted_sets_test.go b/vendor/github.com/xuyu/goredis/sorted_sets_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/sorted_sets_test.go
rename to vendor/github.com/xuyu/goredis/sorted_sets_test.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/strings.go b/vendor/github.com/xuyu/goredis/strings.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/strings.go
rename to vendor/github.com/xuyu/goredis/strings.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/strings_test.go b/vendor/github.com/xuyu/goredis/strings_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/strings_test.go
rename to vendor/github.com/xuyu/goredis/strings_test.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/transactions.go b/vendor/github.com/xuyu/goredis/transactions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/transactions.go
rename to vendor/github.com/xuyu/goredis/transactions.go
diff --git a/Godeps/_workspace/src/github.com/xuyu/goredis/transactions_test.go b/vendor/github.com/xuyu/goredis/transactions_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/xuyu/goredis/transactions_test.go
rename to vendor/github.com/xuyu/goredis/transactions_test.go