Merge pull request #10 from simonpasquier/sync-nagios-model

Sync nagios class with mk-lab-salt-model