This reverts commit aaf92c8c
variables that are set up in dm.deploy.conf or dm_dev.deploy.conf
dm_dev.deploy.conf. Add some info on testing once the system is up.