Address immediate `kitchen test` failing, with final solution to follow.

Note: This does not address the proper loading of Thor defaults,
.kitchen.yml settings and CLI-specified precedence ordering.

Closes #260
References #121
Merge branch 'master' into fix-busser-sandboxing

Conflicts:
	lib/kitchen/cli.rb