Nicer error message on service state when you watch enable/disable
Use salt.utils.is_darwin() for __virtual__ in osxdesktop module
Merge pull request #17044 from jacksontj/2014.7

Nicer error message on service state when you watch enable/disable
Fix nonsense language in error message
reword docstring
add virtual function
don't load on windows
Merge pull request #17048 from terminalmage/osxdestkop-virtual

Use salt.utils.is_darwin() for __virtual__ in osxdesktop module
Update nssm to 2.24
Merge pull request #17059 from cro/nssm_update

Update nssm to latest 2.24 (2014-08-31 release)
Merge pull request #17049 from terminalmage/quickfix

Fix nonsense language in error message