Default options were never returned if omit_pillar flag was set to false
Simplistic tests (still better than none)
Allow providing the environment variable to load configuration from.

Now, `config_master`, `config_minion` and `client_config` accept the proper environment variable to load configuration from. This allows projects sub-classing salt's master and minion, for example, to provide their own environment variable.
Protect against the `log_path` being set to `None`.
Merge pull request #3332 from s0undt3ch/develop

Some more external sub-classing and code re-use support
Allow providing the defaults dictionary to override.
Merge pull request #3333 from s0undt3ch/develop

Allow providing the defaults dictionary to override.
Typo correction.
Merge branch 'develop' of github.com:saltstack/salt into develop
Fix `tests.unit.pydsl_test` and `tests.unit.stateconf_test`.

No more errors are shown because the configuration files are not readable, and in fact, the minion configuration can be use, unlike what was said in the comment.
Merge pull request #3334 from s0undt3ch/develop

Fix `tests.unit.pydsl_test` and `tests.unit.stateconf_test`.
Number of commits is not limited to 2 chars.
Merge pull request #3335 from s0undt3ch/develop

Number of commits is not limited to 2 chars.
updated to add an example of other standard top matching types in pillar files.

Not sure if you'll like my example, but we should add at least one example of how to use other standard top matching types into the top.sls file.
Merge pull request #3336 from ydavid365/patch-1

updated to add an example of other standard top matching types in pillar...
Fix some of the formatting and use a stock grain so people don't

go looking for a non standard grain
`default_include` should also be checked against provided defaults.
`client_config` should also support receiving it's own defaults.
Merge pull request #3337 from s0undt3ch/develop

`client_config` should also support receiving it's own defaults.
Added docs for pydsl and fixed a syntax inconsistency.