Use #model_name on instances instead of classes

This allows rails code to be more confdent when asking for a model name, instead of having to ask for the class.

Rails core discussion here: https://groups.google.com/forum/#!topic/rubyonrails-core/ThSaXw9y1F8
ActiveModel::Naming should be included instead of extended

extend ActiveModel::Naming -> include ActiveModel::Naming