Fix dependencies and directory layout
Specify correct berkshelf version
Add recipe for installing git