Update for Ohai 7 compatibility

Yeah, it looked like it did a lot of nice munging of stuff.