Merge branch 'polar_cms_upload_exec' of github.com:wchen-r7/metasploit-framework into wchen-r7-polar_cms_upload_exec
Merge branch 'master' of github.com:L1ghtn1ng/metasploit-framework into L1ghtn1ng-master
Process.spawn instead of system

Per @bturner-r7's comment here:

https://github.com/rapid7/metasploit-framework/pull/1514#discussion_r3129535
Fix polarcms_upload_exec exploit
Merge pull request #1154 from todb/feature/go_pro
Merge branch 'master' of github.com:rapid7/metasploit-framework
Add spec and a few fixes for set_uri
Merge branch 'feature/http/authv2' of git://github.com/dmaloney-r7/metasploit-framework into dmaloney-r7-feature/http/authv2

Conflicts:
	lib/rex/proto/http/client.rb
fix timeout

20 seconds is way too long for jsut opening a socket
Whitespace
Axe tests that belong in client_request_spec
Reflect new ClientRequst in docs
Whitespace
Default cgi to true when not given
Merge branch 'feature/sqli-exploitation-mssql' of github.com:tasos-r7/metasploit-framework into tasos-r7-feature/sqli-exploitation-mssql
Merge branch 'bug/fix_screenspy' of github.com:kernelsmith/metasploit-framework into kernelsmith-bug/fix_screenspy
fix weak and strong cipher enumerators
Set some reasonable defaults

Fixes a number of nil deref issues
Format Authorization header like others

Also sorts the set_*_header methods
Set reasonable defaults for more things

All current tests are passing now