Add relationships between models
Merge branch 'master' of https://github.com/lesavoie/nagiosservice

Merge model updates with existing changes