Update to support Rails ~> 3.1