Merged the new ConfDict and the old ConfigDict into one class.
Added depr() warnings to all old ConfigDict APIs.
Added ConfigDict.load_dict()
Fixed server tests