Update Gemfile to bring in metasploit-model new gem

- Also rebase to master

Author: cdelafuente-r7

Gemfile

@@ -4,7 +4,6 @@ source 'https://rubygems.org'
 gemspec name: 'metasploit-framework'
 
 gem 'metasploit-credential', git: 'https://github.com/cdelafuente-r7/metasploit-credential', branch: 'enh/MS-9710/add_pkcs12_metadata'
-gem 'metasploit-model', git: 'https://github.com/cdelafuente-r7/metasploit-model', branch: 'feat/model/search/operation/jsonb'
 gem 'metasploit_data_models',  git: 'https://github.com/cdelafuente-r7/metasploit_data_models', branch: 'enh/visitor/jsonb'
 
 # separate from test as simplecov is not run on travis-ci

Gemfile.lock

@@ -14,16 +14,6 @@ GIT
       rubyntlm
       rubyzip
 
-GIT
-  remote: https://github.com/cdelafuente-r7/metasploit-model
-  revision: 925a11f61f02123f29e32bb196b374390d36beb6
-  branch: feat/model/search/operation/jsonb
-  specs:
-    metasploit-model (5.0.3)
-      activemodel (~> 7.0)
-      activesupport (~> 7.0)
-      railties (~> 7.0)
-
 GIT
   remote: https://github.com/cdelafuente-r7/metasploit_data_models
   revision: 34fc27d3059c919eac98cf2a8061c31146189a26
@@ -335,6 +325,10 @@ GEM
       activesupport (~> 7.0)
       railties (~> 7.0)
       zeitwerk
+    metasploit-model (5.0.3)
+      activemodel (~> 7.0)
+      activesupport (~> 7.0)
+      railties (~> 7.0)
     metasploit-payloads (2.0.189)
     metasploit_payloads-mettle (1.0.35)
     method_source (1.1.0)
@@ -608,7 +602,6 @@ DEPENDENCIES
   memory_profiler
   metasploit-credential!
   metasploit-framework!
-  metasploit-model!
   metasploit_data_models!
   octokit
   pry-byebug