Update Gemfile.lock
Charles Rosen update.
Update Gemfile.lock
Merge branch 'before-broken-reorg' into testing-2.1

Conflicts:
	Gemfile.lock