Simple but substantial grains refactor
Simple but substantial grains refactor

    - Some of the Provides comments were wrong for windows and bsd
    - Use with statment for some of the open calls
    - Clean up some code to be a bit easier to read and maintain
    - Clean up a bunch of pylint 'errors' and unused variables
    - cmd.run has defaulted to stripping output since I made it
      so there is no point in all of these grains to re-strip().

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt