Land rapid7#6214, rapid7#6060, simplify framework gem layout and version scheme

This merges things up and removes duplicate gemspecs so we can easily make
framework gem releases for embedding in 3rd-party projects.

Author: Brent Cook

Gemfile

@@ -11,10 +11,6 @@ group :coverage do
   gem 'simplecov'
 end
 
-group :db do
-  gemspec name: 'metasploit-framework-db'
-end
-
 group :development do
   # Markdown formatting for yard
   gem 'redcarpet'
@@ -38,10 +34,6 @@ group :development, :test do
   gem 'rspec-rails' , '>= 2.12', '< 3.0.0'
 end
 
-group :pcap do
-  gemspec name: 'metasploit-framework-pcap'
-end
-
 group :test do
   # cucumber extension for testing command line applications, like msfconsole
   gem 'aruba'

Gemfile.lock

@@ -3,35 +3,31 @@ PATH
   specs:
     metasploit-framework (4.11.5)
       actionpack (>= 4.0.9, < 4.1.0)
+      activerecord (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)
       bcrypt
       filesize
       jsobfu (~> 0.3.0)
       json
       metasm (~> 1.0.2)
       metasploit-concern (= 1.0.0)
+      metasploit-credential (= 1.0.1)
       metasploit-model (= 1.0.0)
       metasploit-payloads (= 1.0.16)
+      metasploit_data_models (= 1.2.9)
       msgpack
+      network_interface (~> 0.0.1)
       nokogiri
       packetfu (= 1.1.11)
+      pcaprub
+      pg (>= 0.11)
       railties
       rb-readline-r7
       recog (= 2.0.14)
       robots
       rubyzip (~> 1.1)
       sqlite3
       tzinfo
-    metasploit-framework-db (4.11.5)
-      activerecord (>= 4.0.9, < 4.1.0)
-      metasploit-credential (= 1.0.1)
-      metasploit-framework (= 4.11.5)
-      metasploit_data_models (= 1.2.9)
-      pg (>= 0.11)
-    metasploit-framework-pcap (4.11.5)
-      metasploit-framework (= 4.11.5)
-      network_interface (~> 0.0.1)
-      pcaprub
 
 GEM
   remote: https://rubygems.org/
@@ -242,8 +238,6 @@ DEPENDENCIES
   factory_girl_rails (~> 4.5.0)
   fivemat (= 1.2.1)
   metasploit-framework!
-  metasploit-framework-db!
-  metasploit-framework-pcap!
   pry
   rake (>= 10.0.0)
   redcarpet