Rescue CookbookNotFound in lockfile#load!
Merge pull request #727 from RiotGames/lockfile_load-master

Rescue CookbookNotFound in lockfile#load!
Fix failing lockfile feature
Fix generator files to allow multiple hyphens in cookbook_name
Merge pull request #732 from maoe/multiple-hyphens-in-cookbook-name

Fix generator files to allow multiple hyphens in cookbook_name
Merge changes from RiotGames/berkshelf master