Gemfile: Update pebbles-river.
Merge branch 'use_pebbles_river' into consolidated_pull_requests

Conflicts:
	Gemfile.lock