Merge pull request #4 from peoplemerge/master

completed basic test
Merge pull request #5 from peoplemerge/master

track IPs in json structures as well
Merge pull request #6 from peoplemerge/master

Started to write tests to capture info on hosts etc
developing structure and entity relationships
fix test errors