Use MDM 0.17.0 stock as master branch is broken.

This resolves all issues I know of with the recog branch on
Metasploit Framework, but obviously most of the benefits of
this branch come from having a recog-aware MDM, something
that can't happen until MDM 0.17.6+ is supported by the
framework.

In short, this should be good to merge, but will not solve
the intended problems until MDM 0.17.6+ is fixed for MSF

Author: HD Moore

Gemfile

@@ -26,8 +26,13 @@ gem 'sqlite3'
 group :db do
   # Needed for Msf::DbManager
   gem 'activerecord', '>= 3.0.0', '< 4.0.0'
-  # Database models shared between framework and Pro
-  gem 'metasploit_data_models', '>= 0.17.2'
+
+  # Database models shared between framework and Pro (depends on hmoore-r7 branch until merged)
+  # Unfortunately, MDM is broken after 0.17.0 in master right now, so waiting on that merge...
+
+  gem 'metasploit_data_models', '= 0.17.0'
+  # gem 'metasploit_data_models', :git => '[email protected]:hmoore-r7/metasploit_data_models.git'
+
   # Needed for module caching in Mdm::ModuleDetails
   gem 'pg', '>= 0.11'
 end

Gemfile.lock

@@ -1,31 +1,22 @@
-GIT
-  remote: [email protected]:hmoore-r7/metasploit_data_models.git
-  revision: 369398260def99448ff26371d304bb03b2176b4c
-  specs:
-    metasploit_data_models (0.17.0)
-      activerecord (>= 3.2.13)
-      activesupport
-      pg
-
 GIT
   remote: [email protected]:rapid7/recog.git
-  revision: 915799d493f96ea8c6981fc8b4bc3fc06acde06c
+  revision: 9c2983de2e2ebbeb98c2211b5be95ab4099479bc
   specs:
     recog (0.01)
       nokogiri
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.17)
-      activesupport (= 3.2.17)
+    activemodel (3.2.19)
+      activesupport (= 3.2.19)
       builder (~> 3.0.0)
-    activerecord (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    activerecord (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.17)
+    activesupport (3.2.19)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
@@ -38,12 +29,16 @@ GEM
     fivemat (1.2.1)
     i18n (0.6.9)
     json (1.8.0)
-    mini_portile (0.5.2)
+    metasploit_data_models (0.17.0)
+      activerecord (>= 3.2.13)
+      activesupport
+      pg
+    mini_portile (0.6.0)
     msgpack (0.5.5)
     multi_json (1.0.4)
     network_interface (0.0.1)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
     packetfu (1.1.9)
     pcaprub (0.11.3)
     pg (0.17.1)
@@ -81,7 +76,7 @@ DEPENDENCIES
   factory_girl (>= 4.1.0)
   fivemat (= 1.2.1)
   json
-  metasploit_data_models!
+  metasploit_data_models (= 0.17.0)
   msgpack
   network_interface (~> 0.0.1)
   nokogiri