Revert "Use riak2 branch of oleksiyk/riakpbc"

This reverts commit 6e6a0f017edc52f2587b4e07bd4f699f566d2d98.