Update to Rails 3.2.11
Merge branch 'gem-upgrade'