Make sure our config settings get merged properly