Dockerfile can now be used to run the daemon
Merge branch 'dev-docker'

Conflicts:
	scripts/dev-config/cloud-config.yaml