Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Remove unused import.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Rudimentary multi-pkg support for homebrew

This got left out when implementing multi-pkg support. This commit adds
support for "pkgs" but not "sources". I'm unable to test it currently
but would like to improve this in the future. But as it is, this commit
will prevent a few tracebacks in pkg states for Mac users, and that's a
good first step.
Merge pull request #3165 from archtaku/brew_multipkg

Rudimentary multi-pkg support for homebrew
Add loading grains from a file in /etc/salt called grains
Write the refresh file flag for the running minion
Merge branch 'develop' of github.com:saltstack/salt into develop
Fix output from salt-call to look like normal salt output
Fixed two bugs:

  - missing global name(_callable got deleted in the loop) bug in modules/useradd.py
  - no 'mako' attribute from salt.utils.templates.
Provide a way to survey minion's version
Rename sorted_minions to version_status to be more descriptive
Edited for the new layout of the pki directory in version 0.11+
Fixed two bugs:

  - missing global name(_callable got deleted in the loop) bug in modules/useradd.py
  - no 'mako' attribute from salt.utils.templates.
Merge branch 'develop' of github.com:kjkuan/salt into develop