bump version
Merge branch 'riak2' of github.com:nlf/riakpbc into riak2