update test kitchen support for 1.0
add test-kitchen support
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	.kitchen.yml
	Berksfile
	Gemfile