Merged latest commits from Opscode into Nagios cookbook