Added extra template support
Updated section heading
License information added
Fixed boilerplate in BSD license
Author name changed to company name
Merge branch 'master' of github.com:mikesilky/zcollective into mikesilky-master

Conflicts:
	lib/zcollective/zabbixclient.rb