Nagios and other random changes
Merge