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