Fix config handling

Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com> (github: samalba)
Merge pull request #424 from dotcloud/hotfix

Fix config handling