Correct the CVE reference
more comments
Added reference & depth

Added reference to IOActive's release.
Added a depth option to allow user to specify how many folders to traverse.
Merge pull request #1433 from jjarmoc/jjarmoc-rails_xml_scan

rails_xml_yaml_scanner.rb improvements
Merge branch 'ovftool_format_string_browser' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-ovftool_format_string_browser
Merge branch 'master' of github.com:rapid7/metasploit-framework
Merge branch 'ovftool_format_string_fileformat' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-ovftool_format_string_fileformat
Web::HTTP#_request: allow Rex opt level overrides

Allow overriding options at the Rex level when performing requests
via the Auxiliary::Web::HTTP wrapper.
Merge branch 'guiUpdate' of github.com:scriptjunkie/metasploit-framework into scriptjunkie-guiUpdate
Msftidy whitespace
Adds a pre-commit hook that fires off msftidy

If people use this, it'll cut down quite a bit on trivial module errors.
Fix multi-line output due to bad regex flag
Merge remote-tracking branch 'upstream/master'
typo in method name
Fixups to the Linksys module

Professionalizes the description a little, but more importantly, handles
LANIP better, I think. Instead of faking a 1.1.1.1 address, just detect
if it's set or not in a method and return the right thing accordingly.

Please test this before landing, obviously. I think it's what's
intended.
Add pcaprub to gem deps
Note linking strat in comment docs
Merge remote-tracking branch 'upstream/master'
Merge branch 'http/auth_methods' of git://github.com/dmaloney-r7/metasploit-framework into dmaloney-r7-http/auth_methods
Allow user to set ssl cipher

Rex::Socket::Tcp now allows the user to specify a cipher or ciphers to
try and use for the ssl connection in addition to the version.