Update adagios.conf

rebasing into adagios's master