Merge branch 'nessus-bridge-gem' of git://github.com/kost/metasploit-framework into kost-nessus-bridge-gem

Also fix minor merge conflict.

Author: pbarry-r7