Update to Riak 2.0beta4, cleanup related configuration.
Merge branch 'master' into sdc-update-2.0beta4

Conflicts:
	advanced.config
	provision.sh
Merge pull request #5 from basho-labs/sdc-update-2.0beta4

Update to Riak 2.0beta4, cleanup related configuration.