Added function to generate a password or key and store in local grains
Fail if django-admin script cannot be found; also check without .py ext
Added clean option to the hg.latest revision #7395
Removed warnings because these modules are clearly not going anywhere and are stable #7395
Fixing grant_option False being evaluated as a string and therefore True
added main run to simple.py
Removed previous fix for grant_option False and am using salt.utils.is_true instead
Changed remaining 'if grant_option' to 'salt.utils.is_true(grant_option)'
added missing s
Nic profile changes

- Implement 3 styles of profile definition
- Support both config.options and config.get
- Replaces NIC substituions with template
- xml unit tests fixed up
Merge pull request #7592 from s0undt3ch/hotfix/lint

Logs download should be done in a separate step.
Virt Template deploy, and serial xml tests

- Added virt templates to setup
- moved NIC xml string template to file
- added tests for serial xml
Fix typos
Merge pull request #7593 from corywright/patch-1

Fix typos
Set and get a Windows machine's ntp servers
Merge pull request #7595 from UtahDave/develop

Set and get a Windows machine's ntp servers
A minor clarity fix for documentation regarding the extension of Salt.

I attempted to preserve what I believe to be the original intent of the author but please feel free not to merge these changes if you feel that I've failed in doing so. :]
Add note about salt-ssh package to salt-ssh docs
Merge pull request #7599 from basepi/sshdocs7579

Add note about salt-ssh package to salt-ssh docs
Merge pull request #7596 from cachedout/develop

A minor clarity fix for documentation regarding the extension of Salt.