Add a peer method, elaborate desc and prints
Merge upstream and deconflict #3310 whitespace
Maybe deconflict #3310 for real?

Hmm i kinda suck at this.
Merge from an upstream deconflict

This is probably a stupid way to do it; it'd be easier to rebase but
whatevs.
Add a false positive check
Light touchup on FP checker
Deconflict #3310 and correct the description
cleans up numerous superfluous returns in msf/core/module
Add module for CVE-2014-0497
Add testing information to description
Fix author
Land #3334, fix author by @julianvilas
Land #3332, superfluous return cleanup
Land todb-r7#7, fix indents and grammar
Land #3310, OpenSSH timing attack improvements
Support one line js payload 

Add missing ';' in `run_cmd_source`
Merge #3335, @bcoles's fixes to FF JS payloads for single-line payloads.
Land #3333 - Adobe Flash Player Integer Underflow Remote Code Execution