upgrade to rails 3.2.11
Merge branch 'enhancements'