fixed comments left in by accident
Merge pull request #1380 from todb-r7/feature/mailmap_and_commit_count

Godspeed, friends.
Various fixes and improvements

Chunk_length now varies according to targeturi and parameter
A few typographical inconsistences corrected
CMD option removed as its not being used
custom http request timeout removed
Updating Meatballs1 mailmap per request
fixing issue raised by @meatballs1
Merge branch 'struts-param-rce' of https://github.com/Console/metasploit-framework into Console-struts-param-rce
cleanup for struts_code_exec_parameters
Update keylogrecorder.rb

Added -k option which, if provided, will attempt to kill the old pid after a successful migration.

Fixed a bug where a blank line would get added to the log file every polling interval if no keystrokes had been detected during that interval.
Update keylogrecorder.rb

Removed redundant code, added error checking.
add Joomla Component JCE File Upload Code Execution
Fix to print out correct/full username
Merge epo_sql fix from neinwechter

Easy, sensible fix -- since report_auth_info uses full_user, print_good
should too.

[Closes #1629]
Merge branch 'download_exec_shell' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-download_exec_shell
Merge branch 'bug/web-path-api-update' of github.com:tasos-r7/metasploit-framework into tasos-r7-bug/web-path-api-update
Merge branch 'master' of github.com:shellster/metasploit-framework into shellster-master
Update keylogrecorder.rb

Added new -c option for value 2, which will start the keylogger in the current process instead of attempting to migrate.  I also made this setting the default.
Merge branch 'kingview_kingmess_kvl' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-kingview_kingmess_kvl
Merge branch 'mutiny_subnetmask_exec' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-mutiny_subnetmask_exec
Merge branch 'module-psexec_command-file_prefix' of github.com:kn0/metasploit-framework into kn0-module-psexec_command-file_prefix
Randomize the "div_container" var because it's global

It's best to randomize this variable name because it's global.