Upgrade to Ohai 7