latest tweaks and new commits
Merge branch 'master' of github.com:clayton256/nagios-plugins

Conflicts:
	check_rsnapshot.pl