Merge branches 'master' and 'master' of https://github.com/DataMap13/DataMap
Updates to get the new configuration script/vermont configuration to work with the daemons.