Merge pull request #160 from dlorenc/development

Add docker_opts parameter to docker_daemon.