fairly large reorg of config options into raft and out of db...