Merge pull request #300 from shapeblue/guestosandmappings

Guest OS and hypervisor mappings