Allow admin and stats users to be defined by provider attributes

Also upgrades to the latest Berkshelf and Chef. Specs pass now.