Merge remote branch 'origin/bug/fix-double-slashes'

Ran the new normalize_uri() specs, all passes, so I'm quite confident in
this change.
NameError undefined local variable or method output - fixed
Merge branch 'crystal_reports_printcontrol' of git://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-crystal_reports_printcontrol
Merge branch 'jvazquez-r7-crystal_reports_printcontrol'
Fixed minor spelling errors
Merge branch 'sap_soap_rfc_dbmcli_sxpg_command_exec' of git://github.com/nmonkee/metasploit-framework into nmonkee-sap_soap_rfc_dbmcli_sxpg_command_exec
Merge branch 'patch-6' of git://github.com/mubix/metasploit-framework into mubix-patch-6
Merge branch 'tasos-r7-web-modules'
Merge branch 'smb_fixes' of git://github.com/alexmaloteaux/metasploit-framework into alexmaloteaux-smb_fixes
Merge branch 'master' into averagesecurityguy-master
msftidy cleanup
Merge branch 'mipsle-shell_reverse_tcp' of git://github.com/kost/metasploit-framework into kost-mipsle-shell_reverse_tcp
Added module for ZDI-12-168
update authors
Merge branch 'master' of git://github.com/charles-n2netsec/metasploit-framework into charles-n2netsec-master
Something tells me charles wanna try 5 times, not 6 times.
Merge branch 'indusoft_issymbol_internationalseparator' of git://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-indusoft_issymbol_internationalseparator
Merge branch 'netlm_downgrade.rb' of git://github.com/zeknox/metasploit-framework into zeknox-netlm_downgrade.rb
Further refactoring
Make sure return vals are handled correctly.