Merge branch '2014.7_sam4' of https://github.com/SmithSamuelM/salt into SmithSamuelM-2014.7_sam4
Lint 1
lint 2
Add info about running unittests w/o integration test daemons
Add versionadded RST directive
Add versionadded RST directive
Add versionadded RST directive
improved compatibility with different versions of novaclient
docfix: user_update was documented as user_create

s/user_update/user_create/
added comment
Make renderers fully aware of pillar context
Merge pull request #16193 from thatch45/SmithSamuelM-2014.7_sam4

Merge #16177
Update 'doc/.tx/config' - Build #166

  http://cookingwithsalt.org/job/salt/job/transifex/166/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
Add note on how to set pillar data on the command line to pillar tutorial

Closes #14217
Cleaned up event forwarding. No longer nests inside spurious message just forwards event msg as is
Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam5
Merge pull request #16248 from SmithSamuelM/2014.7_sam5

Cleanup up Eventer event forwarding
pub_sig to pubkey_sign so that the tutorial isnt broken in /doc/topics/tutorials/multimaster_pki.rst
Remove wingdbstub import
Merge pull request #16250 from cro/wingdb_remove

Remove wingdbstub import