Add Strainer use for test
Fix travis to use it.
Merge pull request #138 from optiflows-cookbooks/travis

Add Strainer use for test
Merge pull request #140 from ftclausen/zabbix-java-gateway-server

Support for managing the Zabbix Java Gateway.
Initial support for super basic oracle connections

* Does not initialise anything
Add support for Oracle DB type
Clean up Berksfile and remove duplicate libcurl package installation
Whitespace cleanup in Berksfile
Fix typo when finding Zabbix server using node search
Template item for Zabbix server was not working with dot syntax.
Converted to use hash-like syntax
Merge branch 'basic-oracle' of github.com:ftclausen/zabbix into basic-oracle

Conflicts:
	metadata.rb
	templates/default/zabbix_agentd.conf.erb
Remove conflict markers
Merge pull request #135 from ftclausen/basic-oracle

Very basic Oracle support for Zabbix server.
Merge branch 'master' into bb-mega-merge

Conflicts:
	metadata.rb
	templates/default/zabbix_agentd.conf.erb
Some fixes that will hopefully be done upstream soon

* Berksfile - Depend on local iis without unicode in it
* recipes/web_apache.rb - Assign with node precedence