Merge pull request #1 from mikesilky/master

Option handling fixed
Merge pull request #2 from mikesilky/master

Use zabbix_template mcollective plugin to find template aliases
Bumped version number for packaging
Merge pull request #3 from mikesilky/master

Added --connect-by-ip option, made default to connect by hostname
Increased version number to 0.0.5
Merge branch 'master' of github.com:mikesilky/zcollective into mikesilky-master

Conflicts:
	lib/zcollective/zabbixclient.rb
Bumped version number for release
Merge remote-tracking branch 'upstream/master'