merge branch 'master' into PR branch

make Travis happy

Author: justinsteven

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metasploit-framework (4.12.24)
+    metasploit-framework (4.12.26)
       actionpack (~> 4.2.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -34,16 +34,23 @@ PATH
       recog
       redcarpet
       rex-arch
+      rex-bin_tools
+      rex-core
       rex-java
       rex-mime
+      rex-nop
       rex-ole
       rex-powershell
       rex-random_identifier
       rex-registry
+      rex-rop_builder
+      rex-socket
+      rex-sslscan
       rex-struct2
       rex-text
       rex-zip
       robots
+      rubyntlm
       rubyzip
       sqlite3
       sshkey
@@ -84,7 +91,7 @@ GEM
     arel (6.0.3)
     arel-helpers (2.3.0)
       activerecord (>= 3.1.0, < 6)
-    aruba (0.14.1)
+    aruba (0.14.2)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
@@ -94,7 +101,7 @@ GEM
     bcrypt (3.1.11)
     bit-struct (0.15.0)
     builder (3.2.2)
-    capybara (2.7.1)
+    capybara (2.8.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -230,9 +237,18 @@ GEM
     redcarpet (3.3.4)
     rex-arch (0.1.1)
       rex-text
+    rex-bin_tools (0.1.0)
+      metasm
+      rex-arch
+      rex-core
+      rex-struct2
+      rex-text
+    rex-core (0.1.2)
     rex-java (0.1.2)
     rex-mime (0.1.1)
       rex-text
+    rex-nop (0.1.0)
+      rex-arch
     rex-ole (0.1.2)
       rex-text
     rex-powershell (0.1.64)
@@ -241,21 +257,30 @@ GEM
     rex-random_identifier (0.1.0)
       rex-text
     rex-registry (0.1.0)
+    rex-rop_builder (0.1.0)
+      metasm
+      rex-core
+      rex-text
+    rex-socket (0.1.0)
+      rex-core
+    rex-sslscan (0.1.0)
+      rex-socket
+      rex-text
     rex-struct2 (0.1.0)
     rex-text (0.2.1)
     rex-zip (0.1.0)
       rex-text
     rkelly-remix (0.0.6)
     robots (0.10.1)
-    rspec-core (3.5.2)
+    rspec-core (3.5.3)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
-    rspec-rails (3.5.1)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -311,4 +336,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.12.5
+   1.13.1

data/msfpescan/identify.txt

@@ -4722,3 +4722,4 @@ zxcvbn
 zxcvbnm
 zzzz
 zzzzzz
+vagrant

data/wordlists/common_roots.txt

@@ -1212,3 +1212,4 @@ SQL
 CMOSPWD
 dadmin
 wlcsystem
+vagrant

data/wordlists/default_pass_for_services_unhash.txt

@@ -16,3 +16,4 @@ xampp
 wampp
 ppmax2011
 turnkey
+vagrant

data/wordlists/http_default_pass.txt

@@ -8,3 +8,4 @@ wampp xampp
 newuser wampp
 xampp-dav-unsecure ppmax2011 
 admin turnkey
+vagrant vagrant

data/wordlists/http_default_userpass.txt

@@ -11,3 +11,4 @@ sys
 wampp
 newuser
 xampp-dav-unsecure
+vagrant

data/wordlists/http_default_users.txt

@@ -88393,3 +88393,4 @@ z
 �migr�s
 �p�e
 �tude
+vagrant

data/wordlists/password.lst

@@ -49,3 +49,4 @@ root dbps
 root ibm
 root monitor
 root turnkey
+root vagrant

data/wordlists/root_userpass.txt

@@ -4,3 +4,4 @@ role1
 root
 tomcat
 s3cret
+vagrant