replace gemnasium with david-dm in readme
update butils dependency
fix merge conflict
Merge branch 'search_response_test' of github.com:nlf/riakpbc into search_response_test