ng map.jinja fix: properly merge settings: pillar with defaults

[aaronm-cloudtek]

ntp: ng: settings: pillar completely overrides defaults even when only a single key is defined. Modified map.jinja to merge defaults with pillar.

[gravyboat]

Thanks.