Reverse the error wording in Chef::ChefFS::FileSystem#copy_entries
AIX functional tests involving BFF need to be run as root.
add json pretty print tests to some knife show commands
Merge pull request #1786 from opscode/lcg/json-pretty-print

add json pretty print tests to some knife show commands
Merge pull request #1734 from opscode/jhs/chef_fs

Reverse the error wording in Chef::ChefFS::FileSystem#copy_entries
fix specs broken due to JSON monkeypatching issues

yajl/ffi-yajl vs JSON whitespace issues
Merge pull request #1802 from opscode/lcg/fix-travis

fix specs broken due to JSON monkeypatching issues
Issue 1754: Chef::Exceptions::Env exception when modifying env resource using key_name attribute that differs in case from the environment variable name
Change encoding to Unix, remove inaccuracy in example description
Merge pull request #1774 from opscode/adamedx/issue-1754-windows-env

Issue 1754: Chef::Exceptions::Env exception when modifying env resource ...
remove JSON gem usage

should fully convert to using ffi-yajl

there are still issues with JSON gem monkeypatching interacting with
chef-zero and the spec tests so we keep the requires here for the
json gem and the ffi_yajl/json_gem here.  when ohai and chef-zero are
fixed, we an just require ffi_yajl.
Merge pull request #1787 from opscode/lcg/remove-json-monkeypatching

Lcg/remove json monkeypatching
Update CHANGELOG for Chef Issues 1754
Merge pull request #1782 from juliandunn/aix-bff-functional-requires-root

AIX functional tests involving BFF need to be run as root.
Enable Travis to run Test Kitchen on EC2.
Ignore .kitchen/ and Berksfile.lock
Separate .kitchen.ymls for local TK (vagrant) and travis TK (ec2) runs
Add example test for installed git.
Add information on using Test Kitchen for E2E testing.
Update for new branch in test-kitchen