Disabled test server in the tests
Merge branch 'registry_test' of https://github.com/dotcloud/docker into registry_test

Conflicts:
	registry/registry_mock_test.go
gofmt