Services

Added support for hping output
Kvasir is now able to merge nessus and nmap services
Bugfix: Importing an Nmap xml with OS details works now correctly
D'oh! Extra spaces!