Upgrade to Berkshelf 3.0 / haribu's fix for Ubuntu

Upgrade to Berkshelf 3.0 / haribu's fix for Ubuntu.