Merge remote-tracking branch 'upstream/master' into develop
Add force_reload for debian_service, upstart and systemd and use it as default in mod_watch if available
Merge remote-tracking branch 'upstream/develop' into develop
More clarification/correction to hacking docs

Running pip install -e /path/to/git/clone from within the virtualenv
does not also install salt's additional required modules, as the
document suggests. I ran into this issue last week and so did a guy I
was helping troubleshoot in #salt.

Also, I clarified the bit about using --system-site-packages in your
virtualenv.
Make pidfile respect root_dir setting
Add notes for developing on RedHat variants
Merge pull request #2992 from tf198/develop

Make pidfile respect root_dir setting
Restrict import of pkgutil.py to Solaris only

This fixes #2994.
Catch exception when state does not return dictionary. Also print the
error producing state.
Merge pull request #2993 from jacksontj/develop

Adding use_list to msgpack, this is due to msgpack depricating the defau...
Merge pull request #2991 from archtaku/docs

More clarification/correction to hacking docs
Merge pull request #2996 from archtaku/issue2994

Restrict import of pkgutil.py to Solaris only
Merge pull request #2997 from torhve/develop

Better error handling when state doesn't return a dictionary
Merge pull request #2998 from jacksontj/develop

Add "version" kwarg to yumpkg
Make pkgutil.py import as pkgutil instead of pkg
Merge pull request #3000 from jacksontj/develop

Salt State pkg.installed enforce package versions
Merge pull request #3001 from archtaku/develop

Make pkgutil.py import as pkgutil instead of pkg
salt.utils: add is_linux() and is_windows()

These were mainly added after I saw the 2/3 different ways various
places in the salt code check to see if a platform is indeed windows
or not and I wanted to consolidate them all including the grains before
there necessarily is __grains__['os'] to rely on.
Switch the core grains to salt.utils.is_windows()
Move windows detection to using salt.utils.is_windows()

Also makes the reg and win_network modules not attempt to load when
there are missing python modules.