Merge branch 'master' into elasticsearch_improvements

* master:
  package set no likey chef 111
  undoing package_set change
  version bump
  fix for new-style set attributes in package_set
  fixed angry chef node.set

Conflicts:
	cookbooks/package_set/VERSION
Merge branch 'elasticsearch_improvements'