a few bug fixes
Merge branch 'master' of github.com:prometheus/nagios_plugins