Remove old :local option from knife-essentials commands
(superceded by global -z option)
remove redundant words
Windows support for Chef::Runlock.

This ensures that if someone does a manual chef-client run, it doesn't fail if the chef is configured as a service on windows and if there is a chef-client run happening right now. The newly started run will wait for the old run to finish and continue after it.
Make "Starting chef-zero" message easier to read
Add "path-based" category to essentials commands so they show up in knife help better
Set cache_path under the user's home dir rather than the local repo path
Fix issue where multiple threads try to create same directory at the same time
Clean out the comments and reorganize code in run_lock.rb
When reporting a resource, before and after should always be a hash

If a Resource (or LWRP) overrides Resource#state (meaning to set an
attribute named state) this collides with the state function used to
gather up the state_attrs

Fix this by not using Resource#state, but copying that logic
into ResourceReporter#state.

Leaving Resource#state as it's used by other things.  A full fix so
LWRPs can't override functions in Resource is in scope for Chef 12
test -- adding knife-diff.1 man page
Merge branch 'jc/CHEF-4614/state-is-hash'
Disable concurrent solo tests on ruby 1.8.7 because Process.spawn doesn't exist.
Add help category to knife path-based commands
Fix knife download EEXISTS error on parallel download
Add --config-file-jail to avoid loading user knife.rb in tests
Merge branch 'jk/local_multi_cache_path'
Merge pull request #1046 from opscode/CHEF-4470

CHEF-4470: Running chef-client fails when chef is running as a service on windows.
Fix Chef::Checksum::Storage::Filesystem unit tests after the changing default for checksum path in config.
Merge pull request #1054 from opscode/windows-cvt-fix

Fix CVTs in the new CI cluster