Small code cleanup
Merge branch 'master' of github.com:agemooij/riak-scala-client into spray-1.2