Upgrade to Berkshelf 3.1.2
Merge branch 'berks3'