Berkshelf port

Major clean-up and port to using berkshelf.