fix markup in docstring
Improved git describe exception handling.

Previously we were catching the same exception in two places because on Windows the `child_traceback` attribute is not set on the exception, so, the initial exception catching we had was just working properly on Linux. Now we just check for the proper `errno` value, if it's not 2(The system cannot find the file specified), we still raise the exception so we can properly fix and handle it.
Merge pull request #3494 from giantlock/develop

fix markup in docstring
Merge pull request #3465 from s0undt3ch/hotfix/git-describe-single-call

Support git describe versioning on windows and also one less subprocess. Refs #3461.
Fix issues with resolve_dns change
Added rcS to modules/debian_service.py get_enabled().
Add check for bad not eval in compound matcher
Add compound matcher tests
Re-factored cli options merging with the config into it's own mix-in. Refs #2563.

This will be useful in `salt-cloud` which copied this functionality over.
Fix test failure due to update in the default nested outputter
Update the remaining parsers to use `MergeConfigMixIn`. Refs #2563.
Merge pull request #3498 from s0undt3ch/develop

Re-factored cli options merging with the config into it's own mix-in. Refs #2563.
Merge pull request #3496 from MTecknology/develop

Added rcS to modules/debian_service.py get_enabled().
Breaking out rpm.py into lowpkg
Switch yumpkg.py to use lowpkg for file_list()
Switch yumpkg.py to use lowpkg for verify()
Merge pull request #3501 from techhat/yumpkg

Implementing lowpkg module for yum/rpm
virtualenv.managed args index_url, extra_index_url

Pass index_url and extra_index_url along to pip module when installing
requirements in virtualenv.managed state.
kill a zmq finally
Merge pull request #3502 from gthb/virtualenv.managed-index-args

virtualenv.managed args index_url, extra_index_url