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
Change temporary directory name, clean more things
Do not remove outputs on clean
Merge branch 'master' of github.com:rapid7/metasploit-framework
Merge branch 'master' of github.com:rapid7/metasploit-framework
Merge branch 'master' of github.com:rapid7/metasploit-framework
Merge branch 'master' of github.com:rapid7/metasploit-framework
Merge branch 'master' of github.com:rapid7/metasploit-framework
Msftidy fixes
Armitage Updates and Bug Fixes

This is Armitage release 01.04.13. This update fixes several bugs
and improves the user experience launching *_login modules from
Armitage. This update adds a Windows 8 icon and includes a fix to
better work with the Metasploit 1.45 installer's environment.
Metasploit 4.5 Installer Environment Tweak

Armitage on Windows requires the user to specify their MSF
install folder. This tweak checks for an MSF 4.5 environment
and updates the specified folder to make everything work.

Like magic.
Merge pull request #1246 from rsmudge/armitage

Armitage Updates and Bug Fixes
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
Merge branch 'FireFart-msftidy_1'