Fix converting association options to a Relation

Under Rails 3 when using an association matcher in conjunction with a submatcher such as #order, we have to take the options on the association (:conditions, :order, etc.) and convert them to an ActiveRecord::Relation object. Converting an :includes option was broken because there were no tests for this.