Added Kevs changes
Updated Submodule
Updated to master
Added Handling for Berkshelf
Changing back to defaults
Merge pull request #32 from timodwhit/latest

Berkshelf Handling