Added option to save services with the associated host.
Reworked logic a little bit
Minor tweaks to fit coding style
Merge pull request #129 from ppepos/merge_host_and_services

Added option to save services with the associated host.