Separate a) initialization of the http api and b) actually serving the api into 2 distinct jobs
Engine: 'start' starts the specified container
httpapi: don't create a pidfile if it isn't set in the configuration
Engine: fix a bug which caused handlers to be shared between multiple engine instances
Engine: don't export private testing utilities
Engine: improved logging and identification of jobs
Engine: optional environment variable 'Logging' in 'serveapi'
Hack: simplify the creation of test directories
Engine: fix a bug when encoding a job environment to json
Better error reporting in engine logs and unit tests
Fix main()
Engine: 'create' creates a container and prints its ID on stdout
Remove debug messages
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
Change crypto export notice to meet Debian requirements
Merge branch 'job-create-start-clean' into engine-patch-2

Conflicts:
	engine/engine.go
	engine/job.go
	server.go
	utils_test.go
Typo in ROADMAP.md
add a little more info about the limitations of ADD wrt ../ and docker build -
Merge pull request #2680 from inglesp/patch-1

Typo in ROADMAP.md
Merge pull request #2656 from shykes/export-restrictions-debian

Change crypto export notice to meet Debian requirements