do some fix for testing
Merge branch 'master' of git://github.com/cheneydeng/go-dockerclient

Conflicts:
	testing/server.go