Default options were never returned if omit_pillar flag was set to false
Simplistic tests (still better than none)
Merge pull request #3329 from mjarco/fix-config-options-defaults

Default options were never returned if omit_pillar flag was set to false (or unset)