Fix deprecated code path usage in RiakBucket.search()
Merge pull request #273 from xen0n/update-bucket-search

Fix deprecated code path usage in RiakBucket.search()
Disallow non-string bucket names. Fixes #268
Merge pull request #274 from basho/bugfix/bucket-name-type

Disallow non-string bucket names. Fixes #268
Merge branch '2.0-stable'
Add protobuf yokozun admin support
Add version 2.0 and detect for yz admin
Merge pull request #276 from basho/feature/er/yokozuna

Add protobuf yokozuna admin support
Issue #279 - Disable Nagle on HTTP

Disables Nagle on HTTP Connections, but not HTTPS, will resolve some
situations where there can be additional latency on PUT requests.
Merge branch 'sdc-2i-timeout'

Conflicts:
	setup.py
Merge branch '2.0-stable'
Merge branch '2.0-stable'
Merge pull request #280 from hscic/master

Issue #279 - Disable Nagle on HTTP
Fix PEP8 warnings from #280.
PEP8 cleanup.
Use assertTrue instead of assert.
fixed little 'bug' in the documentation. Delete shouldn't store an object. ;)
Merge pull request #288 from btv/master

Documentation Error, delete doesn't store a RiakObject.
Removing out of date and misleading deb package metadata.
Merge pull request #291 from derpston/master

Removing out of date and misleading deb package metadata.