handle mattr as well as cattr when preventing rails override
Updated changelog