Fix travis-ci
Merge branch 'master' of github.com:dotcloud/docker-registry