Merge pull request #6130 from UtahDave/develop

Add note about silent_flags on Windows installers.
pillar: fix minor bug
Merge pull request #6131 from mgwilliams/bugs

pillar: fix minor bug
Allow alternate enc names to be used for ssh_auth states

If 'rsa' or 'dss', etc. are used as the 'enc' value in ssh_auth.present
states (rather than 'ssh-rsa' or 'ssh-dss'), the call to
salt.modules.ssh.check_key() will fail, which causes ssh_auth.present
states to mistakenly report the key as needing to be changed. This
commit adds a call to salt.modules.ssh._refine_enc(), which normalizes
the 'enc' param so that the call to ssh.check_key() does not fail.

Fixes #5374.
Merge pull request #6134 from terminalmage/issue5374

Allow alternate enc names to be used for ssh_auth states
Add docstrings to some state methods
Add backing for running states imperitive
fix bad var in state updates
Always use an ordered dict for yaml renderer
Deal with multi comp id decs wrt auto_order
indent code
Merge pull request #6135 from hvnsweeting/develop

indent code in doc
OpenVZ Hardware Node process list fix

Fixed a bug with OpenVZ Hardware Node (virtual:openvzhn) using a
missing `vzps` command, not an official tool anymore

The Fix:
Obtain the processes running on hardware node as OpenVZ recommends and
format to looks like regular `ps -efH` for salt
Some formatting, logic, and speedup improvements(only create the same regexes once).
Fix pylint errors, the `_rvm()` and `_do_rvm()`  were being given `runas` twice because of a badly constructed `command` string.
Merge pull request #6137 from jpea/develop

OpenVZ Hardware Node process list fix
Remove the `tty` logic left from 0d6ff2e.
Fix bad first argument of `SSHCopyID`.

* Keep a reference to the passed `opts` since they are used further down the class.
Work around pylint bug of wrongly reporting too many arguments.

More info on http://hustoknow.blogspot.pt/2013/06/pylint.html
Double to single quotes and fix non python 2.6 compatible `format()` call using `{}` instead of `{0}`.