Rails 3.2.12ish

This pulls rails from git at the present head of 3-2-stable.  There's some regressions in 3.2.11 that have been reverted, so we'll pull those in for now until upstream releases 3.2.12.