convert numeric const quorum values to strings and vice versa
bump version
Merge pull request #52 from nlf/quorum_values

convert numeric const quorum values to strings and vice versa
Avoid streaming when callbacks are in use
Fix random travis fails
Merge pull request #55 from oleksiyk/master

Avoid streaming when callbacks are in use
simplify a little
1.2.6
Merge branch 'master' into riak2

Conflicts:
	.travis.yml
Merge pull request #56 from oleksiyk/riak2

Merge master into riak2 branch