Fixed the importing of NBE files
Merge remote-tracking branch 'gerry/nbe_importing_fix' into rapid7
Merge branch 'master' of github.com:rapid7/metasploit-framework into rapid7