options are now using objects instead of strings
Merge branch 'jgn-multiple-nvals' of github.com:basho/riak_control into jgn-multiple-nvals