This should be replaced with riak.conf