Cleanup and one code fix

Fixes:

* Fixed bug in looking up the OS strings
* I've moved things around a bit so that it is now installable
* The code conforms better to pep8 recommendations