Merge pull request #36 from rapid7/master

aa

Author: Pedro Ribeiro

.mailmap

@@ -1,58 +1,56 @@
-acammack-r7 <acammack-r7@github>     Adam Cammack <[email protected]>
+acammack-r7 <acammack-r7@github>     <[email protected]>
+acammack-r7 <acammack-r7@github>     <[email protected]>
+acammack-r7 <acammack-r7@github>     <[email protected]>
+bcook-r7 <bcook-r7@github>           <[email protected]>
 bcook-r7 <bcook-r7@github>           <[email protected]>
-bcook-r7 <bcook-r7@github>           Brent Cook <[email protected]>
-bpatterson-r7 <bpatterson-r7@github> Brian Patterson <[email protected]>
-bpatterson-r7 <bpatterson-r7@github> bpatterson-r7 <[email protected]>
-bturner-r7 <bturner-r7@github>       Brandon Turner <[email protected]>
-bwatters-r7 <bwatters-r7@github>     Brendan <[email protected]>
-bwatters-r7 <bwatters-r7@github>     Brendan Watters <[email protected]>
-cdoughty-r7 <cdoughty-r7@github>     Chris Doughty <[email protected]>
-dheiland-r7 <dheiland-r7@github>     Deral Heiland <[email protected]>
-dmaloney-r7 <dmaloney-r7@github>     David Maloney <[email protected]>
-dmaloney-r7 <dmaloney-r7@github>     David Maloney <[email protected]>
-dmaloney-r7 <dmaloney-r7@github>     dmaloney-r7 <[email protected]>
-dmohanty-r7 <dmohanty-r7@github>     Dev Mohanty <[email protected]>
-dmohanty-r7 <dmohanty-r7@github>     Dev Mohanty <[email protected]>
-dmohanty-r7 <dmohanty-r7@github>     dmohanty-r7 <[email protected]>
-dmohanty-r7 <dmohanty-r7@github>     dmohanty-r7 <[email protected]>
-ecarey-r7 <ecarey-r7@github>         Erran Carey <[email protected]>
-farias-r7 <farias-r7@github>         Fernando Arias <[email protected]>
-gmikeska-r7 <gmikeska-r7@github>     Greg Mikeska <[email protected]>
-gmikeska-r7 <gmikeska-r7@github>     Gregory Mikeska <[email protected]>
-jbarnett-r7 <jbarnett-r7@github>     James Barnett <[email protected]>
-jhart-r7 <jhart-r7@github>           Jon Hart <[email protected]>
-jlee-r7 <jlee-r7@github>             <[email protected]> # aka egypt
-jlee-r7 <jlee-r7@github>             <[email protected]>
-kgray-r7 <kgray-r7@github>           Kyle Gray <[email protected]>
-khayes-r7 <khayes-r7@github>         l0gan <[email protected]>
-lsanchez-r7 <lsanchez-r7@github>     Lance Sanchez <[email protected]>
-lsanchez-r7 <lsanchez-r7@github>     Lance Sanchez <[email protected]>
-lsanchez-r7 <lsanchez-r7@github>     Lance Sanchez <[email protected]>
-lsanchez-r7 <lsanchez-r7@github>     Lance Sanchez <[email protected]>
-lsanchez-r7 <lsanchez-r7@github>     darkbushido <[email protected]>
-lsato-r7 <lsato-r7@github>           Louis Sato <[email protected]>
-pbarry-r7 <pbarry-r7@github>         Pearce Barry <[email protected]>
-pdeardorff-r7 <pdeardorff-r7@github> Paul Deardorff <[email protected]>
-pdeardorff-r7 <pdeardorff-r7@github> pdeardorff-r7 <[email protected]>
-sdavis-r7 <sdavis-r7@github>         Scott Davis <[email protected]>
-sdavis-r7 <sdavis-r7@github>         Scott Lee Davis <[email protected]>
-sdavis-r7 <sdavis-r7@github>         Scott Lee Davis <[email protected]>
-sgonzalez-r7 <sgonzalez-r7@github>   Sonny Gonzalez <[email protected]>
-sgonzalez-r7 <sgonzalez-r7@github>   Sonny Gonzalez <[email protected]>
-shuckins-r7 <shuckins-r7@github>     Samuel Huckins <[email protected]>
-tdoan-r7 <tdoan-r7@github>           tdoan-r7 <[email protected]>
-tdoan-r7 <tdoan-r7@github>           thao doan <[email protected]>
-todb-r7 <todb-r7@github>             Tod Beardsley <[email protected]>
-todb-r7 <todb-r7@github>             Tod Beardsley <[email protected]>
-todb-r7 <todb-r7@github>             Tod Beardsley <[email protected]>
+bpatterson-r7 <bpatterson-r7@github> <“[email protected]”>
+bpatterson-r7 <bpatterson-r7@github> <[email protected]>
+bturner-r7 <bturner-r7@github>       <[email protected]>
+bwatters-r7 <bwatters-r7@github>     <[email protected]>
+cdoughty-r7 <cdoughty-r7@github>     <[email protected]>
+dheiland-r7 <dheiland-r7@github>     <[email protected]>
+dmaloney-r7 <dmaloney-r7@github>     <[email protected]>
+dmaloney-r7 <dmaloney-r7@github>     <[email protected]>
+dmohanty-r7 <dmohanty-r7@github>     <[email protected]>
+ecarey-r7 <ecarey-r7@github>         <[email protected]>
+egypt <egypt@github>                 <[email protected]> # aka egypt
+egypt <egypt@github>                 <[email protected]>
+jbarnett-r7 <jbarnett-r7@github>     <[email protected]>
+jbarnett-r7 <jbarnett-r7@github>     <[email protected]>
+jhart-r7 <jhart-r7@github>           <[email protected]>
+jinq102030 <jinq102030@github>       <[email protected]>
+jinq102030 <jinq102030@github>       <[email protected]>
+jmartin-r7 <jmartin-r7@github>       <[email protected]>
+kgray-r7 <kgray-r7@github>           <[email protected]>
+khayes-r7 <khayes-r7@github>         <[email protected]>
+lsanchez-r7 <lsanchez-r7@github>     <[email protected]>
+lsanchez-r7 <lsanchez-r7@github>     <[email protected]>
+lsanchez-r7 <lsanchez-r7@github>     <[email protected]>
+lsanchez-r7 <lsanchez-r7@github>     <[email protected]>
+lsanchez-r7 <lsanchez-r7@github>     <[email protected]>
+lsato-r7 <lsato-r7@github>           <[email protected]>
+lvarela-r7 <lvarela-r7@github>       <“[email protected]”>
+pbarry-r7 <pbarry-r7@github>         <[email protected]>
+pdeardorff-r7 <pdeardorff-r7@github> <[email protected]>
+pdeardorff-r7 <pdeardorff-r7@github> <[email protected]>
+sdavis-r7 <sdavis-r7@github>         <[email protected]>
+sdavis-r7 <sdavis-r7@github>         <[email protected]>
+sdavis-r7 <sdavis-r7@github>         <[email protected]>
+sgonzalez-r7 <sgonzalez-r7@github>   <[email protected]>
+sgonzalez-r7 <sgonzalez-r7@github>   <[email protected]>
+shuckins-r7 <shuckins-r7@github>     <[email protected]>
+tatanus <tatanus@github>             <[email protected]>
+tdoan-r7 <tdoan-r7@github>           <[email protected]>
+todb-r7 <todb-r7@github>             <[email protected]>
+todb-r7 <todb-r7@github>             <[email protected]>
+todb-r7 <todb-r7@github>             <[email protected]>
 wchen-r7 <wchen-r7@github>           <[email protected]> # aka sinn3r
 wchen-r7 <wchen-r7@github>           <[email protected]>
-wvu-r7 <wvu-r7@github>               William Vu <[email protected]>
-wvu-r7 <wvu-r7@github>               William Vu <[email protected]>
-wvu-r7 <wvu-r7@github>               William Vu <[email protected]>
-wvu-r7 <wvu-r7@github>               wvu-r7 <[email protected]>
-wwebb-r7 <wwebb-r7@github>           William Webb <[email protected]>
-wwebb-r7 <wwebb-r7@github>           wwebb-r7 <[email protected]>
+wvu-r7 <wvu-r7@github>               <[email protected]>
+wvu-r7 <wvu-r7@github>               <[email protected]>
+wvu-r7 <wvu-r7@github>               <[email protected]>
+wwalker-r7 <wwalker-r7@github>       <[email protected]>
+wwebb-r7 <wwebb-r7@github>           <[email protected]>
 
 # Above this line are current Rapid7 employees. Below this paragraph are
 # volunteers, former employees, and potential Rapid7 employees who, at
@@ -66,15 +64,14 @@ bcoles <bcoles@github>                 bcoles <[email protected]>
 bcoles <bcoles@github>                 Brendan Coles <[email protected]>
 bokojan <bokojan@github>               parzamendi-r7 <[email protected]>
 brandonprry <brandonprry@github>       <[email protected]>
-brandonprry <brandonprry@github>       Brandon Perry <[email protected]>
 brandonprry <brandonprry@github>       Brandon Perry <bperry@bperry-rapid7.(none)>
+brandonprry <brandonprry@github>       Brandon Perry <[email protected]>
 brandonprry <brandonprry@github>       Brandon Perry <[email protected]>
-bwall <bwall@github>                   (B)rian (Wall)ace <[email protected]>
 bwall <bwall@github>                   Brian Wallace <[email protected]>
+bwall <bwall@github>                   (B)rian (Wall)ace <[email protected]>
 ceballosm <ceballosm@github>           Mario Ceballos <[email protected]>
-Chao-mu <Chao-Mu@github>               Chao Mu <[email protected]>
-Chao-mu <Chao-Mu@github>               chao-mu <[email protected]>
 Chao-mu <Chao-Mu@github>               chao-mu <chao@confusion.(none)>
+Chao-mu <Chao-Mu@github>               <[email protected]>
 ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <[email protected]>
 ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <[email protected]>
 claudijd <claudijd@github>             Jonathan Claudius <[email protected]>
@@ -85,32 +82,34 @@ crcatala <crcatala@github>             Christian Catalan <[email protected]>
 darkoperator <darkoperator@github>     Carlos Perez <[email protected]>
 efraintorres <efraintorres@github>     efraintorres <[email protected]>
 efraintorres <efraintorres@github>     et <>
-espreto <espreto@github>               Roberto Soares <[email protected]>
-espreto <espreto@github>               Roberto Soares <[email protected]>
-espreto <espreto@github>               Roberto Soares Espreto <[email protected]>
-espreto <espreto@github>               Roberto Soares Espreto <[email protected]>
+espreto <espreto@github>               <[email protected]>
 fab <fab@???>                          fab <> # fab at revhosts.net (Fabrice MOURRON)
+farias-r7 <farias-r7@github>           <[email protected]>
+FireFart <FireFart@github>             <[email protected]>
 FireFart <FireFart@github>             <[email protected]>
-FireFart <FireFart@github>             Christian Mehlmauer <[email protected]>
+gmikeska-r7 <gmikeska-r7@github>       <[email protected]>
+gmikeska-r7 <gmikeska-r7@github>       [email protected] <=>
+gmikeska-r7 <gmikeska-r7@github>       [email protected] <YOUR_USERNAME_FOR_EMAIL>
 g0tmi1k <g0tmi1k@github>               <[email protected]>
 g0tmi1k <g0tmi1k@github>               <[email protected]>
+h00die <h00die@github>                 <[email protected]>
+h00die <h00die@github>                 <[email protected]>
 h0ng10 <h0ng10@github>                 h0ng10 <[email protected]>
 h0ng10 <h0ng10@github>                 Hans-Martin Münch <[email protected]>
-hdm <hdm@github>                       HD Moore <[email protected]>
 hdm <hdm@github>                       HD Moore <[email protected]>
+hdm <hdm@github>                       HD Moore <[email protected]>
 hdm <hdm@github>                       HD Moore <[email protected]>
-jabra <jabra@github>                   Josh Abraham <[email protected]>
-jabra <jabra@github>                   Joshua Abraham <[email protected]>
+jabra <jabra@github>                   <[email protected]>
 jcran <jcran@github>                   <[email protected]>
 jcran <jcran@github>                   <[email protected]>
 jcran <jcran@github>                   <[email protected]>
 jcran <jcran@github>                   <[email protected]>
 jduck <jduck@github>                   <[email protected]>
 jduck <jduck@github>                   <[email protected]>
 jgor <jgor@github>                     jgor <[email protected]>
+joevennix <joevennix@github>           Joe Vennix <[email protected]>
 joevennix <joevennix@github>           <[email protected]>
 joevennix <joevennix@github>           <[email protected]>
-joevennix <joevennix@github>           Joe Vennix <[email protected]>
 joevennix <joevennix@github>           jvennix-r7 <[email protected]>
 juanvazquez <juanvazquez@github>       jvazquez-r7 <[email protected]>
 juanvazquez <juanvazquez@github>       jvazquez-r7 <[email protected]>
@@ -139,15 +138,20 @@ r3dy <r3dy@github>                     Royce Davis <rdavis@Royces-MacBook-Pro-2.
 r3dy <r3dy@github>                     Royce Davis <[email protected]>
 rep <mschloesser-r7@github>            Mark Schloesser <[email protected]>
 rep <mschloesser-r7@github>            mschloesser-r7 <[email protected]>
+RageLtMan <sempervictus@github>        <rageltman [at] sempervictus>
+RageLtMan <sempervictus@github>        <[email protected]>
 Rick Flores <[email protected]>  Rick Flores (nanotechz9l) <[email protected]>
 rsmudge <rsmudge@github>               Raphael Mudge <[email protected]> # Aka `butane
+rwhitcroft <rwhitcroft@github>         <[email protected]>
+rwhitcroft <rwhitcroft@github>         <[email protected]>
+rwhitcroft <rwhitcroft@github>         <[email protected]>
 schierlm <schierlm@github>             Michael Schierl <[email protected]> # Aka mihi
 scriptjunkie <scriptjunkie@github>     Matt Weeks <[email protected]>
 scriptjunkie <scriptjunkie@github>     scriptjunkie <[email protected]>
 skape <skape@???>                      Matt Miller <[email protected]>
 spoonm <spoonm@github>                 Spoon M <[email protected]>
-stufus <stufus@github>                 Stuart <[email protected]>
 stufus <stufus@github>                 Stuart Morgan <[email protected]>
+stufus <stufus@github>                 Stuart <[email protected]>
 swtornio <swtornio@github>             Steve Tornio <[email protected]>
 Tasos Laskos <[email protected]> Tasos Laskos <[email protected]>
 techpeace <techpeace@github>           Matt Buck <[email protected]>
@@ -157,10 +161,10 @@ TomSellers <TomSellers@github>         Tom Sellers <[email protected]>
 trevrosen <trevrosen@github>           Trevor Rosen <[email protected]>
 trevrosen <trevrosen@github>           Trevor Rosen <[email protected]>
 TrustedSec <[email protected]>      trustedsec <[email protected]>
-void-in <void-in@github>               root <[email protected]>
+void-in <void-in@github>               void_in <[email protected]>
 void-in <void-in@github>               void-in <[email protected]>
+void-in <void-in@github>               <[email protected]>
 void-in <void-in@github>               void-in <[email protected]>
-void-in <void-in@github>               void_in <[email protected]>
 void-in <void-in@github>               Waqas Ali <[email protected]>
 zeroSteiner <zeroSteiner@github>       Spencer McIntyre <[email protected]>
 

.ruby-version

@@ -1 +1 @@
-2.3.1
+2.3.3

.travis.yml

@@ -1,16 +1,17 @@
+dist: trusty
 sudo: false
 group: stable
 bundler_args: --without coverage development pcap
 cache: bundler
 addons:
-  postgresql: '9.3'
+  postgresql: '9.6'
   apt:
     packages:
       - libpcap-dev
       - graphviz
 language: ruby
 rvm:
-  - '2.3.1'
+  - '2.3.3'
 
 env:
   - RAKE_TASKS="cucumber cucumber:boot" CREATE_BINSTUBS=true