Upgrade berkshelf to 3.x

Conflicts:
	script/cooker