Make the conditions rails 4 compatible
Need to also pass the options through
Second param is the scope now
Allow for variable params
Merge branch 'master' into rails-4

Conflicts:
	lib/polymorphic_integer_type/extensions.rb
Add the options as well in the has_many
Fix for Rails 4