Added zabbixapi gem
Merge remote-tracking branch 'upstream/master'

Conflicts:
	puppet.rb
Merge pull request #22 from word/master

Added zabbixapi gem