Wip os type

Should have been called wip-os-version. Anyway this just adds --os-version support and the previous os_version stuff moved to its own function.