Update to the latest Rails.

This addresses the following vulnerabilities:
* CVE-2013-0155
* CVE-2013-0156

http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
Merge branch 'master' into offsite

Conflicts:
	Gemfile.lock
Merge branch 'offsite' into amazon