Moved repository to use Berkshelf.
Fixed merge conflict.