Add normalize_uri to modules that may have
been missed by PULL 1045.

Please ensure PULL 1045 is in place prior to
looking at this (as it implements normalize_uri)

ref --> https://github.com/rapid7/metasploit-framework/pull/1045
Formatting
fixed target_uri.path vs target_uri.to_s issue
Set back to target_uri.path
Set back to target_uri.to_s per original module
Crawler aux mixin updated to catch the mysterious and anonymous timeout exception and re-raise it as a Timeout::Error
Merge remote-tracking branch 'upstream/master' into web-modules
Correct unicode probs
Added module for ZDI-12-101
license text
Change the .text-too-small error message.

The original error message apparently confuses people, and this
can be easily improved.  See the following:
https://community.rapid7.com/thread/2356
Ok... even more explicit
Merge branch 'msftidy_fix' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-msftidy_fix
Merge branch 'meaningful_error' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-meaningful_error
Fix typo

Typo found by @schierlm but mentioned after the commit of pull request #1187
Info: https://github.com/rapid7/metasploit-framework/pull/1187#commitcomment-2340457
Merges and resolves CJR's normalize_uri fixes

Merge remote-tracking branch 'ChrisJohnRiley/set_normalize_uri_on_modules'
into set_normalize_uri_on_modules

Note that this trips all kinds of msftidy warnings, but that's for another
day.

Conflicts:
	modules/exploits/unix/webapp/tikiwiki_jhot_exec.rb
	modules/exploits/windows/http/xampp_webdav_upload_php.rb
Caught missing paren
Various and sundry fixes for normalize_uri
Merge branch 'jvazquez-r7-ibm_cognos_tm1admsd_bof'
Fix indent level