rbenv
updated Gemfile
compatibility fixes, I think
Merge branch 'rails_2_3_15'

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'master' into develop