Revert Berksfile.
Upgrade berkshelf to 3.x

Conflicts:
	script/cooker
Merge branch 'master' of github.com:spesnova/cooker
Merge branch 'master' into spesnova/exclude-cask