Merge jvazquez-r7's java exploit
Merge @hdmoore's Ruby 2.0 fixes (iconv)
Pending hashes need to end w a block
Backed out all the fails from the auth bits
Moving @cli and @ip to instance vars
Merge branch 'master' into rspec/rex-http-client
Merge branch 'rspec/rex-http-client'

This lands https://github.com/rapid7/metasploit-framework/pull/1478

Talked to @jlee-r7 on Friday, and since it's only rspec tests, we agreed
that there shouldn't be anything stopping people from landing their own
tests -- we want to encourage rspec writing as much as we can. If you
can write passing tests, then by all means, land them yourself.
Merges ChrisJohnRiley's new password

Lands https://github.com/rapid7/metasploit-framework/pull/1521

Closes #1521

(Forgive the oververbose commit message, experimenting with various
syntax hilighters)
Exploit::Remote::Web#perform_request: timeout set to 10
Uses normalize_uri instead of manually adding a slash
Merge branch 'bcoles-glossword_upload_exec'
Merge branch 'kordil-edms-upload-exec' of github.com:bcoles/metasploit-framework into bcoles-kordil-edms-upload-exec
Merge remote-tracking branch 'rapid7/feature/simplecov-groups' into rapid7
Merge branch 'master' of github.com:rapid7/metasploit-framework into rapid7
Move xor tests to the right filenames

Thanks, simplecov, for telling me that these weren't actually getting
run.
Uses normalize_uri
Merge branch 'bcoles-kordil-edms-upload-exec'
Correct bad naming style
Merge branch 'bcoles-kordil-edms-upload-exec'
Merge branch 'xbmc' of github.com:mandreko/metasploit-framework into mandreko-xbmc