Clean up
Clean up
Merge branch 'master' of https://github.com/TurboTurtle/pysos

Conflicts:
	pysos.py
Added some RHEV code that was lost in a merge to the new 'pysos' file