Restructure a bit and add checks for doubled '//'
Use normalize_uri for URI
added template stuff improve
Merge branch 'http-client-spec-restructure' of github.com:jlee-r7/metasploit-framework into jlee-r7-http-client-spec-restructure
Merge branch 'datalife_template' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-datalife_template
Various style fixes, fix ruby 1.8 compat
Rename with underscores
Fix 1.8 support
Merge branch 'untangle-rename-ms12-020'

Technically, landing my own PR #1429, but it's really just a fixed up
version of #1427
Merge branch 'jvazquez-r7-datalife_template'