make merging of options match meteor.settings more exactly