Bad merge cleanup
fixing t_vulndata requires
Finalizing nessus support