Update to rails 3.2 in preparation for rich upgrade, this triggered a cascade of needed gem updates
Migrated to latest rich, including an update to Paperclip 2.
Merge upgrade_rich branch, fix merge conflicts