Rails version fixes up to CVE 2013-1857

Conflicts:
	Gemfile.lock