RiotGames/berkshelf — pull request #598 by sethvargo (2013-05-31 00:39:56+00:00)
Title: Full backport default locations

Alternative to #591

- Includes all of the important bug fixes that also missed out in 1-4 stable
- Includes Chef Zero changes so we can test the `@chef_server` tags on travis