Fix config environment merging.

Things were getting overwritten that should have been merged.