Fix typo in example
Merge pull request #3161 from alejandrogomez/patch-1

Fix typo in example
Fix typo in pre-passing opts to localclient
Added makeconf state
Merge pull request #3162 from shadowfax-chc/makeconf-state

Added makeconf state
Add multiple-package support to pkg.latest state

Currently only apt is supported, will work on the rest in the coming
days.

As part of this commit, a new function has been added to pkg_resource
called "compare". This will do version-checking where a specific package
provider does not provide a means of reliably comparing versions. This
was made necessary by the fact that distutils.LooseVersion does not
properly handle Ubuntu's weird version strings (like '1.2.3-0ubuntu1').
apt now has its own "compare" function which uses dpkg --compare-versions
to do the comparison. (thanks @thekuffs!)

As I start adding multiple package support for pkg.latest in other
platforms, I will (where possible) create provider-specific "compare"
functions. This should make version checking more reliable, and moving
forward should also make the audit of version support in pkg.installed
much easier to accomplish for providers which don't allow you to install
a package using the following syntax: pkgname>=1.2.3
Removed notify-upower.sh

This was mistakenly added in my last commit.
Fix import

The import of distutils here should have been of distutils.version.
Merge pull request #3163 from archtaku/issue2906

Add multiple-package support to pkg.latest state
Add multiple pkg support to pkg.latest (pacman)

Also tweaked the changes made to the pkg state in 306cc74, and fixed a
logic bug I introduced into apt.py in the same commit.
Merge pull request #3164 from archtaku/issue2906

Add multiple pkg support to pkg.latest (pacman)
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