renamed all occurrences of riak_2index to riak_2i. Probably not the best move in this branch,
but I was going to have to do the work anyways.