Merge branch 'develop' of https://github.com/saltstack/salt into develop
Fix docstrings for the outputters
Change the default outputter in salt-call to be nested
Merge pull request #3239 from torhve/develop

A doc fix and change default outputter in salt-call
Merge pull request #3240 from MTecknology/develop

Learning python.. .get() doesn't work on a list.
Removed calls to a non-existent role
Fixed paths to the master/minion conf files
Changed syntax highlighting from ini to yaml since conf files are yaml
Added missing new modules of varying types
Removed old grub module docs
Misc. rST fixes
Added docs files for new module types
Misc. rST fixes
Get rit of ref assignment error
I accidentily commited a WIP, this will get the compiler going again
Remove a clause that was leaving worker connections in a bad state
StateFire class is ready for testing
Check if Debian family before looking for Debian tools
Since we're shutting down. Set ZMQ socket's linger to 1.

This discards unsent messages as fast as it can. The value needs to be bigger than 0.
PEP-8 and remove unnecessary lambda.