Merge branch 'feature/MSP-12357/meterp-ntds' into feature/MSP-12358/ntds-dump-module

Author: David Maloney

.gitignore

@@ -66,8 +66,10 @@ external/source/exploits/**/Debug
 external/source/exploits/**/Release
 
 # Avoid checking in Meterpreter binaries. These are supplied upstream by
-# the meterpreter_bins gem.
+# the metasploit-payloads gem.
 data/meterpreter/*.dll
+data/meterpreter/*.bin
+data/meterpreter/*.lso
 
 # Avoid checking in Meterpreter libs that are built from
 # private source. If you're interested in this functionality,

.ruby-version

@@ -1 +1 @@
-2.1.5
+2.1.6

.travis.yml

@@ -25,7 +25,7 @@ script:
   - git diff --exit-code && bundle exec rake $RAKE_TASKS
 sudo: false
 rvm:
-  - '2.1'
+  - '2.1.6'
 
 notifications:
   irc: "irc.freenode.org#msfnotify"
@@ -40,4 +40,4 @@ branches:
     - metakitty
 
 addons:
-  postgresql: '9.3'
+  postgresql: '9.3'

Gemfile

@@ -8,7 +8,7 @@ group :coverage do
   # code coverage for tests
   # any version newer than 0.5.4 gives an Encoding error when trying to read the source files.
   # see: https://github.com/colszowka/simplecov/issues/127 (hopefully fixed in 0.8.0)
-  gem 'simplecov', '0.5.4', :require => false
+  gem 'simplecov'
 end
 
 group :db do
@@ -25,12 +25,8 @@ group :development do
 end
 
 group :development, :test do
-  # supplies factories for producing model instance for specs
-  # Version 4.1.0 or newer is needed to support generate calls without the
-  # 'FactoryGirl.' in factory definitions syntax.
-  gem 'factory_girl', '>= 4.1.0'
   # automatically include factories from spec/factories
-  gem 'factory_girl_rails'
+  gem 'factory_girl_rails', '~> 4.5.0'
   # Make rspec output shorter and more useful
   gem 'fivemat', '1.2.1'
   # running documentation generation tasks and rspec tasks