WIP: Updates to configuration settings

Updates based on a recent 2.0 devrel build from Riak 2.0 branch.

See basho/riak_ee#261 as well.