Merge branches 'master' and 'master' of github.com:cmur2/chef-keys