Update to latest test kitchen, add berkshelf, fix FC/rubocop warnings,
avoid bogus FC warnings on travis
Fixes per Seth's comments