Merge branch 'feature_mknod_edits' into feature_mknod
Corrected mknod pylint "line too long" issues
Grammar edit
Merge pull request #7113 from mafrosis/git-symlinks

Handle symlinks to directories in git when force applied
Merge pull request #7112 from gravyboat/develop

Updates to file state documentation to resolve issue 6503.
Merge pull request #7095 from riverajo/postgres-port

convert the port to a string
updated to 0.16.4

The spec file is future ready for salt 0.17, this is commented
I have tested it on sles 11 sp3 and opensuse 12.3 vm.
Merge pull request #7116 from aboe76/suse_0.16.4

Suse package updated to 0.16.4
Add kwargs to pre-flight check
yumpkg5: add pkg suggestions for nonexistant packages

See issue #6298 for more information.
yumpkg: add pkg suggestions for nonexistant packages

See issue #6298 for more information.
Merge pull request #7108 from m87carlson/develop

mem_total in BSD should return as an int, see #7104
Add --raw-shell option to salt-ssh
Add refresh_cache option to salt-ssh
Get --raw working
Add api centric run_iter to the SSH obj
Add SSHClient!!!
Add cmd to the SSHClient
Add ssh support to saltutil.cmd
Hook ssh support into the salt state