Undoing unintentional change with callable
typo..
Merge pull request #3236 from MTecknology/develop

Undoing unintentional change with callable
Fix saltstack/salt-bootstrap#10
Fix issue when extensions are not installed with jinja2
Merge pull request #3237 from s0undt3ch/issues/3214

Adapt to the new local client events changes. Fixes #3214.
Fix docstrings for the outputters
Change the default outputter in salt-call to be nested
Learning python.. .get() doesn't work on a list.
Merge pull request #3239 from torhve/develop

A doc fix and change default outputter in salt-call
typo
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