Merge pull request #116 from ramielrowe/master

Adding request_id to search options
added windows image to image_type.py and tests for image_type.py
forgot the tests, here they are
unit test changes to add some false tests
more false tests
minor unit test changes for readability
full coverage from nosetests
unit test changes from peer review and comment regarding readable function
Removed accidental additional argument in _test_isset(...)
added freebsd and tests
Merge pull request #118 from TMaddox/windows_image_type

added windows image to image_type.py and tests for image_type.py