Merge pull request #5 from tispratik/master

Code was not adding foreign_type constraint

Author: Kyle d'Oliveira

lib/polymorphic_integer_type/extensions.rb

@@ -45,7 +45,8 @@ def remove_type_and_establish_mapping(name, options)
 
           options[:foreign_key] ||= "#{poly_type}_id"
           foreign_type = options.delete(:foreign_type) || "#{poly_type}_type"
-          options[:conditions] ||= {foreign_type => klass_mapping.to_i}
+          options[:conditions] ||= {}
+          options[:conditions].merge!({foreign_type => klass_mapping.to_i})
         end
       end