test fixes, development branch creation
Merge branch 'development' of github.com:lusis/chef-logstash into development