Merge pull request #11 from tomdz/master

Rewrite of the Nagios plugin plus a few other plugin tweaks
Fixed nagios messages
Merge pull request #12 from tomdz/master

Various little enhancements