Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge remote-tracking branch 'wvu-r7/fix-msfpayload-1944' into csharp_payload
Land #1934 - Fix UltraISO Exploit File Creation
Land #1950 - Monkey HTTPD Header Parsing Denial-of-Service

This is the reviewed/updated version of pull request #1950. We're
landing this one instead because the other one has a lot of
unnecessary commit messages.
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Restore file_create

file_create shouldn't have the 'filename' argument, because that
defeats the purpose of function 'file_format_filename'.  The code
change was committed by accident.  Related to #1934.
Fix sap ni proxy, hopefully
Land #1952, Monkey HTTPD DoS module
Clean monkey_headers
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Update both ultraiso files to the right fix
Land #1953, @wchen-r7's fix around fileformat
Make msftidy happy
Land #1944, C# byte array payload
Land #1957 - fix User-agent typos for maxthon_history_xcs.rb
Land #1956 - fix regex error for mozilla_reduceright.rb
Land #1955 - mozilla_mchannel.rb undefined agent variable
Land #1949, make dirbusting optional for crawler
Rename dirbust option to conform to style
Final cleanup for rfcode_reader_enum