Merge pull request #1 from KvasirSecurity/master

Update from original
Allow cpe records to be created when items share a generic cpename
Add OS details when nmap has generic cpe identifier
Add banner output from nmap script to t_services
Merge pull request #47 from 001001/nmap_parser

Add OS CPE and banners to services when parsing Nmap