use merge so empty objects don't kill settings
Merge pull request #14 from dylang/merge-instead-of-extend

use merge so empty objects don't kill settings