version bump
Merge branch 'master' of github.com:lusis/chef-logstash

Conflicts:
	CHANGELOG.md
fixes for service_restart

for issue https://github.com/lusis/chef-logstash/issues/330
Fix Issue #333

Summary: The variables are one thing that should be extensible but
due to use of || the specified variables in the agent recipe
always overrode any new varaibles added via attributes. This fixes
the problem by merging all defined attributes in order of
inheritence.
Refactor
Remove yum. It was in recommends and requires...  Removed from both since there are very clear downstream cookbooks that depend on this.
Add the necessary bits to actually pay attention to the create_account attribute
Keeping the tests happy...trailing space on an otherwise empty line
Merge pull request #345 from chrisstolfi/respect_account_create_attribute

Add the necessary bits to actually pay attention to the create_account
Merge pull request #344 from chrisstolfi/remove_yum

Remove yum.
Merge pull request #342 from brigade/issue.333

Fix Issue #333 - Add all instances attributes to config templates
Merge pull request #346 from lusis/fix_service_restart

Fix service restart
honors plugins_install_type attribute correctly

Removes the default value for 'install_type' in 'resources/plugins.rb'. It was overriding the value of the 'plugins_install_type' attribute
Merge pull request #349 from ydubreuil/fix_plugins_install_type

honors plugins_install_type attribute correctly
Build path using `instance_dir`, as opposed to `homedir`.
Merge pull request #351 from aodn/logrotate_path

Build path using `instance_dir`, as opposed to `homedir`.
Merge remote-tracking branch 'upstream/master' into service-logic-merge
Replace pick_provider