Add :conditions option to uniqueness validator
Conflicts:
	activerecord/lib/active_record/validations/uniqueness.rb