upgrade rails to 3.2.15
Merge branch 'raiils_3.2.15' into rm_production
monkey patch is no longer needed with upgraded rails
upgrade rails