pr#124 cleans up services, fixes nessus and metasploit
Merge pull request #125 from grutz/pr/124

cleans up services, fixes nessus and metasploit (#124)