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
Add force_reload for debian_service, upstart and systemd and use it as default in mod_watch if available
Remove unused import.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
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.
Clean up some logic in the utils python module

Also re-arrange the imports by size due to my OCD
Fix problem with attribute checks when data looks like:
"[(u'bus', u'ide'), (u'dev', u'hdb')]"
Bugfix problems with spaces in filenames
Also disable shell=True for security purposes
Force Gentoo-based distros to use full pkg name

Do not proceed unless package names are provided using the
category/pkgname format. For packages submitted without the category
name, offer suggestions from the portage tree.
Add parsing for qemu-img snapshot list
Remove debugging that got left in
Add "" around values, so yaml doesn't serialize to datetime and etc.
Add 'debiangnu/' to the os name map
Revert unnecessary change from 826e7e4d66.

* Add documentation for logic of _OS_NAME_MAP and _OS_FAMILY_MAP