Remove Ohai for rubygems-based rc, move to temporary Chef branch