Fix how default and custom configs are being merged
Fix how default and custom configs are being merged

berkmancenter/mediacloud,berkmancenter/mediacloud,berkmancenter/mediacloud,berkmancenter/mediacloud,berkmancenter/mediacloud