Preserve (and use) a requested cidfile

This prevents dockrun from clobbering a requested cidfile.
Merge pull request #1 from evanphx/outer-cidfile

Preserve (and use) a requested cidfile