wip
Hack: use helper functions in tests for less copy-pasting
Merge branch 'master' into new_logs
store both logs in a same file, as JSON
add legacy support
add debug and simplify docker logs
Make docs build without warnings or errors. Minor additional cleanup.
add support for container ID files (a la pidfile)
docs - add cidfile flag to run docs
docs - add example for cidfile
create the cidfile before creating the container

This change makes docker attempt to create the container ID file and
open it before attempting to create the container. This avoids leaving
a stale container behind if docker has failed to create and open the
container ID file.

The container ID is written to the file after the container is created.
Merge pull request #1159 from unclejack/add_container_id_file_to_run

*Client: Add support for container ID files (a la pidfile)
Merge pull request #1211 from dotcloud/new_logs

*Runtime: Logs are now synchronised
fix error in utils tests
Merge pull request #1239 from dotcloud/fix_utils_tests

fix error in utils tests
rebase master
Merge pull request #1204 from dotcloud/tests-less-copypaste

Hack: use helper functions in tests for less copy-pasting
remove usage from tests
Merge pull request #1235 from metalivedev/cleandocbld

Make docs build without warnings or errors. Minor additional cleanup.
add container=lxc in default env