updated gem for rails 4 compatibility, removed use of read_inheritable_attribute/write_inheritable_attribute
updated gem info
updated gem info
Adding check on update, throwing deprecation warning
conflicts fixed