Rudy/multi nagios

Continuation of #970 

Moving Nagios to checks.d
That line will never be executed.