Merged in changes from nagios-plugins-kumina

Changes obtained from https://github.com/kumina/nagios-plugins-kumina
This closes #1