Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix the bug that user can't use environment when there is group
Merge pull request #87 from CaseCommonsDevOps/environment_group_fix

Fix the bug that user can't use environment when there is environment group
Changelog and gemspec for 1.2.2
Lowercase MAJOR, MINOR, PATCH, MANUAL to reflect reality

All-caps strings reflect something the user should substitute (as in: knife cookbook upload COOKBOOK). The proper options for bump are not to be used capitalized as indicated in this README, and do not stand for "replace this with your string", so should be lowercase.
Merge pull request #89 from jblaine/patch-1

Whoops, didn't mean to close...Lowercase MAJOR, MINOR, PATCH, MANUAL to reflect reality
ensured berkshelf returns expected cookbook object
Merge pull request #90 from universityofderby/berkshelf

update load_from_berkshelf to return a ::Chef::CookbookVersion object
Merge branch 'master' of github.com:juliandunn/knife-spork
Update for FoodCritic Linter API change: it takes only a single argument now.
Added missing documentation for FoodCritic in the example config.
Merge pull request #94 from juliandunn/foodcritic-api-change

Fix "ArgumentError: wrong number of arguments (2 for 1)" when using Foodcritic
#59: Add custom plugin path config option
#76: Remove legacy code referring to promote all cookbooks
#64: Fix incorrect version number in plugin outputs when -v used with promote
#82: Have spork-check promot for bump if one is needed
#49: Add and document spork omni
#81: Role commands and plugin methods
Make role diff functions and plugin attribs more generic