Allow multiple sources and groups

Move to Berkshelf 3