update test-kitchen dep
better constrain non 1.0 test-kitchen dep
sync syntax
Merge remote-tracking branch 'origin/more-options' into more-options