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.
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
Merge pull request #1235 from metalivedev/cleandocbld

Make docs build without warnings or errors. Minor additional cleanup.