Iterations for code review, removed includes in default attributes, updated kitchen.yml, etc