Merge branch 'invision_pboard_unserialize_exec' of git://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-invision_pboard_unserialize_exec
Use PhpEXE, and a check() function

Uses the PhpEXE mixin for the payload. And then in the future
we can modify PhpEXE again to allow it to be space-free (problem
being a space is required when you use a function).  Also, this
commit has a new check function.
Merge branch 'download_exec' of git://github.com/corelanc0d3r/metasploit-framework into corelanc0d3r-download_exec
Merge branch 'impersonate_ssl_tweak' of git://github.com/ChrisJohnRiley/metasploit-framework into ChrisJohnRiley-impersonate_ssl_tweak
Add missing require for PhpExe
Merge branch 'enum_dirperms_default_path' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-enum_dirperms_default_path
Fixed hard coded paths in psexec on command.rb
Merge branch 'client_system_analyzer_upload' of git://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-client_system_analyzer_upload
Implementing some, but not all, of the suggestions
Merge branch 'feature/contributing' of https://github.com/todb-r7/metasploit-framework into todb-r7-feature/contributing
Not sure why paths were repeated, but no more.
No need to repeat the default values
Merge branch 'jvazquez-r7-client_system_analyzer_upload'
fix nil class error on non-lantronix hosts
change behavior to explicitly note when password is not set (or enhanced password supercedes it) as opposed to an empty string password
Only store the password when there's one
added cookie prefix check
Merge remote-tracking branch 'upstream/master' into web-modules
Merge remote branch 'Meatballs1/smb_login_update'

Thus ends our long national nightmare.
Merge branch 'invision_pboard_cookie_prefix' of git://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-invision_pboard_cookie_prefix