working on a first pass at cucumber for framework
Add @msfconsole tag, simpler module example
Merge pull request #1 from jhart-r7/aruba-testing

Add @msfconsole tag, simpler module example
cutting down on steps calling steps
moving the scenarios around
Add @target hooks to set RHOST/RHOSTS from config
Add missed files
Merge branch 'aruba-testing' into target_hooks
Merge pull request #2 from jhart-r7/target_hooks

Target hooks
moving the module file

adding some comments on things we should not see when running
msfconsole
renaming targets.yml to .example

ignoring the targets.yml file
Merge branch 'staging/electro-release' into aruba-testing
Support Glassfish 4.0 and lots of other changes
Merge branch 'master' into aruba-testing

Conflicts:
	.rubocop.yml
	Gemfile
	Gemfile.lock
	Rakefile
	lib/metasploit/framework/command/console.rb
	lib/metasploit/framework/common_engine.rb
	lib/metasploit/framework/parsed_options/console.rb
	lib/metasploit/framework/require.rb
	lib/metasploit/framework/version.rb
	lib/msf/core/modules/namespace.rb
	modules/auxiliary/analyze/jtr_postgres_fast.rb
	spec/lib/msf/core/framework_spec.rb
Merge branch 'master' into aruba-testing
updating how cucumber loads features

starting to use a cucumber.yml to store the profile configs
we will not be running @targets by default
adding more scenarios

updating ms08-067's scenarios so they are testing show options and show advanced
changing the scenario descriptions and feature descriptions for help.feature and
ms08-067
Updated shodan_search for new API
adding scenarios for booting msfconsole without a db
adding in the positive test case