altered check_dir_file.rb so that it can check for the presence of a list of files/directories supplied using file:/ format rather than being limited to just the one file, handy for checking for indicators of compromise
msf recommended changes + tweaked exception handling
android reverse_http/s
Revert "android reverse_http/s"

This reverts commit 65ada24d9e9caf2a3a39a4bd2d4d6390cded19c5.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'bug/9582-metasploit-imports-and-tasks'

Land #3299
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
re-added incorrectly removed SMBSHARE option
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'