Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
PEP8 fixes from PyLint
Extend pillar matcher to traverse nested dicts
Extend grains matcher to traverse nested dicts
typo fixes
Merge pull request #3423 from baijum/doc

typo fixes
Adding support for custom outputters

- introduced outputter_dirs config option
- added saltutil.sync_outputters command
- saltutil.sync_all calls also saltutil.sync_outputters
Specified current module in stateconf renderer module docs
Fix test case skipping logic: if < py2.7 then no OrderedDict, so skip.

For ordered execution, PyDSL requires py2.7 or above. Although, it's
possible to make it work with a third-party OrderedDict implementation
like the yaml renderer does..., this is not bothered here.
Merge pull request #3426 from kjkuan/pydsl-test-case-fix2

Fix test case skipping logic: if < py2.7 then no OrderedDict, so skip.
Merge pull request #3414 from archtaku/issue3410

Implement #3410
Merge pull request #3422 from herself/develop

Add user/group support for OpenBSD and fix a Darwin user bug
Merge pull request #3425 from aleszoulek/custom_outputters

Custom outputters
small spelling correction
Merge pull request #3428 from archtaku/docs

small spelling correction
* use salt.utils.fopen instead open
* replace file.managed comments by appropriate comments about crontabs
Modified check for existence of hg binary to also work on windows
Merge pull request #3432 from joehealy/develop

Modified check for existence of hg binary to also work on windows