Merge branch 'develop' into HEAD
Merge branch 'develop' into HEAD
Don't free map reduce response on error

The client example frees the map reduce example even when
err != ERIAK_OK causing a segfault.
Merge pull request #30 from basho/feature/bch/add-map-reduce

Add Map/Reduce Message
Merge branch 'develop' into HEAD
Fixed riak_object RpbPair bugs

There were two issues here.

First, only the value portion of the pair was being copied.

Second, the RpbPair structs weren't being initialized, which would cause the
client to core during PB serialization. This would affect setting indexes, links,
or user metadata on a riak_object.
Merge branch 'feature/bch/add-2i' of github.com:basho/riak-c-client into feature/bch/add-2i
Merge pull request #33 from basho/feature/bch/add-2i

Add Secondary Index Message
Merge branch 'develop' into feature/bch/add-riak-search
Fix some issues pointed out in @metadave's PR review
Merge pull request #37 from basho/feature/bch/add-riak-search

Add Riak Search Message
Merge branch 'develop' into refactor/bch/riak-binary-cleanup
Fix changed name of riak_binary_copy_to_pb
Merge pull request #41 from basho/refactor/bch/riak-binary-cleanup

Simplify the riak_binary
Merge branch 'develop' into bugfix/bch/cleanup-build
Merge remote-tracking branch 'remotes/origin/bugfix/bch/cleanup-build' into refactor/bch/riak-object-cleanup

Conflicts:
	src/riak_object.c