Merge pull request #2 from bcwaldon/master

.gitignore

Godeps/Godeps.json

Godeps/Readme

Godeps/_workspace/.gitignore

...s/_workspace/src/github.com/docker/docker/api/MAINTAINERS

Godeps/_workspace/src/github.com/docker/docker/api/README.md

...rkspace/src/github.com/docker/docker/api/api_unit_test.go

..._workspace/src/github.com/docker/docker/api/client/cli.go

...space/src/github.com/docker/docker/api/client/commands.go

...rkspace/src/github.com/docker/docker/api/client/hijack.go

...orkspace/src/github.com/docker/docker/api/client/utils.go

Godeps/_workspace/src/github.com/docker/docker/api/common.go

...space/src/github.com/docker/docker/api/server/MAINTAINERS

...rkspace/src/github.com/docker/docker/api/server/server.go

...c/github.com/docker/docker/api/server/server_unit_test.go

...c/github.com/docker/docker/dockerversion/dockerversion.go

...workspace/src/github.com/docker/docker/engine/MAINTAINERS

.../_workspace/src/github.com/docker/docker/engine/engine.go

...kspace/src/github.com/docker/docker/engine/engine_test.go

Godeps/_workspace/src/github.com/docker/docker/engine/env.go