bumping rails to 3.2.11
Merge remote branch 'origin/rails_bump'