CODING: Cleanup and minor addition.
Merge branch 'maint' of github.com-sreinhardt:nagios-plugins/nagios-plugins into maint