rubocop autocorrect
Merge pull request #142 from guilhem/rubocop

rubocop autocorrect
Use rubocop.yml from https://github.com/opscode-cookbooks/chef-splunk/blob/master/.rubocop.yml
Fix rubocop
Fix all foodcritic
Remove chefspec while we can't fix it
Merge pull request #146 from optiflows-cookbooks/rubocop_rules

Fix rubocop
Add travis status image
Added ValueCacheSize support option
Added ValueCacheSize support option
Don't set attribute already set on the host and defined in web.rb attribute file
Fix agent side branch and verion fetching attributes
Merge pull request #155 from yusukegoto/zbx_agt_atr

Fix agent side branch and verion fetching attributes
Fix default attribute of value_cache_size
Merge pull request #157 from yusukegoto/b_of_value_cache_size

Fix default attribute of value_cache_size
Added StartPollers option for zabbix_server config
Merge branch 'master' into bb-mega-merge

Conflicts:
	providers/host.rb
	recipes/_agent_common_user.rb
	recipes/_providers_common.rb
	recipes/agent_registration.rb
	recipes/web_apache.rb