updated doc to include nested dictionary example to grains.setval
spaces not tabs!
Merge pull request #6682 from mike-ainsworth/develop

add multi-level dict example to grains.setval
Allow deploy in ssh function wrapper
Fix some formatting in salt.states.hg
Fix erroneous variable name and conditional in hg state, Fix #6661
Merge pull request #6684 from basepi/hg6661

Fix erroneous variable name and conditional in hg state, Fix #6661
Kill print
Remove trailing white-space.