Add :conditions option to uniqueness validator
Conflicts:
	activerecord/lib/active_record/validations/uniqueness.rb
Merge pull request #43 from square/backport-uniqueness-conditions

Add :conditions option to uniqueness validator