(maint) Fix missing OS facts

architecture and hardware facts were dropped in a restructuring of
architecture facts into the operating system structured fact. This fixes
that on Solaris and OS X.
Merge pull request #237 from MikaelSmith/maint/master/fix-missing-os-facts

(maint) Fix missing OS facts