Some minor cleanup from yelp/fig

Signed-off-by: Daniel Nephin <dnephin@yelp.com>
Merge pull request #720 from dnephin/upstream_minor_fixes

Support a timeout on docker client