iterating on the zabbix_source, trying to get it to work from arbitrary locations
Pull the source down for the apache web recipe so it can be on its own box
Merge branch 'upstream' into zabbix_api

Conflicts:
	providers/item.rb
	providers/template.rb
Merge branch 'zabbix_api' into integration
Merge branch 'upstream' into pull_source_for_web_apache
Merge branch 'pull_source_for_web_apache' into integration
Ensure branch and version are on all zabbix_source resources
Merge branch 'zabbix_api' into integration

Conflicts:
	recipes/web_apache.rb