Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Harden `git describe` parsing so it does not fail on awkward situations.

This issue came up because a user is using custom tags and git describe for him is something like `debian/0.11.1+ds-1-3-ga0afcb`.
Added unittests for this.
Also include the number of commits after the found tag.
git describe sha signatures have a length of 8 chars.
Fail gracefully as non-privileged user
Merge pull request #3328 from intchanter/develop

Fail gracefully as non-privileged user
Fix adding Range has a hard dep from #3325

A wizard should know better...
Merge pull request #3327 from hvnsweeting/develop

Doc: add command to run standalone minion
Change docs to be third person
Merge pull request #3326 from s0undt3ch/hotfix/git-describe-parsing

Harden `git describe` parsing so it does not fail on awkward situations.
Remove config util module
Default options were never returned if omit_pillar flag was set to false
Simplistic tests (still better than none)
Single quotes
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.