Added several Zabbix discovery rules
Merge branch 'master' of github.com:psaavedra/chic
Conflicts resolved