Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Updated grains.item to accept any num of args, removed sanitize and changed outputter on item
Added sanitize functionality with kargs
Rename nfs to nfs3, since it doesn't support some nfs4 functionality
Merge pull request #3369 from techhat/nfs

Rename nfs to nfs3
Fix pw(8) syntax for user uid/git changes
add new process in supervisor state

process is added if it wasn't there before

some nice supervisor modules included:
 * supervisor.{add,remove,reread,update}
 * supervisor.list - list all process states
 * supervisor.custom - run any custom command (eg from plugins)
use new logo
NFS3 lets you specify multiple shares per line
Add extra explanation to docstring for writing files
do not collide with builtin name ``list``

it was really just a fancier formatted status anyway
forgotten doc string
Add param persist to modules.kmod
Adding introspection for package groups (in yum)
Multi-word, unspaced function names are ugly
Fix typo
update changelog for bugfix release
Merge pull request #3376 from baijum/new_logo

use new logo
Merge pull request #3374 from herself/develop

Fix pw(8) syntax for user uid/gid changes