fix unit tests
Merge branch 'develop' of github.com:giantlock/salt into develop
Merge pull request #4392 from whiskybar/patch-1

fixed a typo
Merge pull request #4386 from terminalmage/issue4383

Make user.info return an empty dict when user not present
Merge pull request #4387 from terminalmage/issue4295

Use __context__ to reduce calls to chkconfig/runlevel
Fix issue with MasterExit being in salt.master.py
Merge pull request #4391 from torhve/develop

Improve nested outputter to check all number types
Merge pull request #4393 from giantlock/develop

fix unit tests
Add docstring and PEP8 Fixes

Because I know how much Tom loves to see PEP8 fixes in pull reqs
Set supplemental groups in _chugid (for runas)
Add indent style stuff
Add code_block decs
Last time I edit on github directly
Merge pull request #4396 from basepi/gitfix4324

Set supplemental groups for 'runas' in cmdmod.py
Improved readability, grammar

Swapped 'a' for 'an' where necessary.  Changed verb agreement.
Uncluttered scentences.
Add documentation to 'fix' pep8 and flake8
Fixed 80 column width

Due to fussy programmers that still live with 1972 standards :P
Fix typos and add more clarification
Merge pull request #4399 from basepi/stylefixes

Add pep8 'fixing' instructions to style guide
Add link to issue from pep8