Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'memory_grep_fixes' of https://github.com/wchen-r7/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'enum_db_no_method' of https://github.com/wchen-r7/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Make comment a little clearer
Initial commit
Don't stack trace on failed option validation

See #2027
Don't continue if opts told us not to generate

Such as is the case with running with --options
Reorganize spec a bit
Refactor spec and add more docs
Abstract the dumper tests
Changed my mind, this goes here
Derp, wrong method name
Merge datastore opts before listing
Add spec for case-insensitive options

See #2027