Pull request collection from @OJ

See the accompanying PR to metasploit-framework, PR rapid7/metasploit-framework#3122

Landing this PR will also land: #69 #70 #75 #77 #78