Merge lgroschen and nscott's branches into NagiosEnterpises

Prepping for the 3.0 release for NSTI.