Update to allow activerecord 4.1.0