Use 2.0 beta4 and fix a couple config switches
Merge branch 'master' of https://github.com/basho-labs/riak-ruby-vagrant

Conflicts:
	provision.sh
set up ssl certs in riak.conf instead of advanced.config
Merge branch 'master' into sdc-update-2.0beta4

Conflicts:
	advanced.config
	provision.sh